mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-07 07:17:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,945 Commits 92 Branches 39 Tags
e9dc3d53e1b2e976fc07625b772d058a30d235d2
Commit Graph

1083 Commits

Author SHA1 Message Date
FrancescoUK
c0b947f72e Merge pull request #2362 from opensourcepos/convert_attribute_type 
Add attribute type conversion, error checking.
 2019-02-24 21:25:46 +00:00
objecttothis
994428eb7f Fix bug preventing new Attribute from being anything but GROUP 2019-02-20 12:06:33 +04:00
WShells
069715fe4a Merge branch 'master' into master 2019-02-16 23:32:37 +02:00
objecttothis
e66c7bad24 Add attribute type conversion, error checking. 2019-02-15 17:03:31 +04:00
FrancescoUK
be4460d1b6 Merge pull request #2344 from opensourcepos/fix-tax-group-rendering 
This fixes the improper display of the tax group
 2019-02-10 12:11:57 +00:00
Steve Ireland
b3f53fa627 Fix tax group rendering issue triggered by "% CE" 2019-02-09 16:33:45 -05:00
Steve Ireland
8bf819abb9 Cash rounding for Chili requires rounding to the nearest 10 pesoes. 2019-02-09 15:51:46 -05:00
Steve Ireland
03fe400e9e Allow user excluded from item kit maintenance to maintain stock type. 2019-02-09 11:56:49 -05:00
jekkos
929f3e63fc Show 6 character git hash instead of 5 (#2352) 2019-02-08 08:26:16 +01:00
objecttothis
3b9bf5eaa4 Correcting positioning of the ospos.css file 
I wasn't aware of the need to build the project before css changes would take effect nor that I could just add `?debug=true` to the URL to see changes.  I've put the line back in its original position and it works without other changes.
 2019-02-05 09:40:27 +01:00
objecttothis
81b056b8f0 Merge pull request #2330 from opensourcepos/third_party_integrations 
Third party integrations
 2019-02-04 17:07:03 +04:00
objecttothis
2d7ea8d4e7 modified CSS id to be unique 
Rather than override an existing CSS id with potential consequences I just created a unique ID in ospos.css
 2019-02-04 13:47:43 +04:00
objecttothis
9b6edaea4d Move ospos.css below opensourcepos.min.css 
This prevents changes in ospos.css from being ignored
 2019-02-04 13:44:40 +04:00
jekkos
2674fbd03f Disable .gitattributes ident (#2324) 2019-02-02 14:08:20 +01:00
objecttothis
00a16ac50b Update manage.php 
Fixed another forgotten change
 2019-01-31 16:42:58 +04:00
objecttothis
6b12cd6cc7 Correct missing change 
Not sure how this didn't get changed before.  I had the change in my test database.  I must have just missed it.
 2019-01-30 10:35:41 +04:00
objecttothis
f238bc7d40 Rename mailchimp_config.php to integrations_config.php 
Rename file to match generic integrations rather than specific mailchimp
 2019-01-29 18:27:41 +04:00
objecttothis
4d13cf2f67 Converting mailchimp config to integrations config 2019-01-29 18:25:44 +04:00
FrancescoUK
cbfb8e5a89 Merge pull request #2289 from opensourcepos/refactor-tax-config 
Refactor Tax Configuration
 2019-01-14 10:59:09 +00:00
jekkos
02d7588e59 Add config item for default order discount 2019-01-13 13:18:51 +01:00
Steve Ireland
20cb007f3c Refactor Tax Configuration 2019-01-10 21:42:15 -05:00
FrancescoUK
74f5bb17bb Update to Bootswatch and Bootstrap 3.4.0 2019-01-07 21:51:36 +00:00
FrancescoUK
0ada6ba25d Fix login missing version issue 2019-01-06 17:21:21 +00:00
jekkos
6c685f89b8 Fix amount formatting in expenses (#2085) 2018-12-30 18:27:58 +01:00
jekkos
4261613316 Fix migration message, add UK translation (#2247) 2018-12-30 18:27:58 +01:00
jekkos
804942cff5 Add warning if migration is needed (#2247) 2018-12-24 20:43:22 +01:00
Steve Ireland
3220469837 Add support for India GST 2018-12-23 09:16:10 -05:00
jekkos
6a47d60d35 Update turkish (#2281) 2018-12-22 15:17:42 +01:00
jekkos
9f386b003b Keep attributes selected when creating new items (#2221) 2018-11-26 13:06:25 +01:00
jekkos
2e67007c69 Fix attributes submit error (#2201) 2018-11-15 21:54:35 +01:00
jekkos
db6963a8a6 Fix blank screen after update (#2201) 2018-11-03 23:24:19 +01:00
FrancescoUK
12ca6125fb Minor fixes 2018-10-21 17:21:05 +01:00
Emilio Silva Schlenker
5650a26381 Corrected indentation, chained some frontend calls 2018-10-21 16:51:34 +01:00
Emilio Silva Schlenker
2122866b50 Supplier field optional, SQL script, removed extra tab 2018-10-21 16:51:34 +01:00
Emilio Silva Schlenker
18db2e5c82 linked expenses with suppliers 2018-10-21 16:51:34 +01:00
jekkos
fd00a74225 Refactor + fix detailed reports (#68) 2018-10-15 19:32:29 +02:00
jekkos
7683cfe5c9 Fix dropdown preselection on edit (#68) 2018-10-15 19:32:29 +02:00
jekkos
43e3400468 Fix item row refresh (#68) 2018-10-15 19:32:29 +02:00
jekkos
74f31dbaf9 Keep unsaved attributes when adding multiple (#68) 2018-10-15 19:32:29 +02:00
jekkos
9cdfc0ce8a Fix css overflow + form refresh 2018-10-15 19:32:29 +02:00
jekkos
e2147d8b00 Update language files (#68) 2018-10-15 19:32:29 +02:00
jekkos
83dc1de6d6 Don't create attributes if custom fields were empty (#68) 2018-10-15 19:32:29 +02:00
jekkos
288b4029d7 Add attributes to detailed sales/receiving reports (#68) 2018-10-15 19:32:29 +02:00
jekkos
b2da8f5e9d Fix attribute delete (#68) 2018-10-15 19:32:29 +02:00
FrancescoUK
f86eaa78a2 Update form.php 2018-10-15 19:32:29 +02:00
FrancescoUK
be3d0fe8e1 Update item.php 2018-10-15 19:32:29 +02:00
FrancescoUK
042c81a6b4 Update form.php 2018-10-15 19:32:29 +02:00
FrancescoUK
27122a8578 Update form.php 2018-10-15 19:32:29 +02:00
jekkos
085d24447c Disablel SHOW_IN_ITEMS (#68) 2018-10-15 19:32:29 +02:00
jekkos
8b212a8dd0 Fix some final bugs (#68) 2018-10-15 19:32:29 +02:00