Laurent Destailleur
|
ce1c5c6873
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/stripe/class/stripe.class.php
htdocs/takepos/invoice.php
|
2020-10-01 19:43:23 +02:00 |
|
Laurent Destailleur
|
0fa139f4e3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/takepos/invoice.php
|
2020-10-01 19:37:56 +02:00 |
|
Laurent Destailleur
|
4d134ade72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/takepos/invoice.php
|
2020-10-01 19:35:49 +02:00 |
|
lvessiller
|
259737f082
|
FIX set paid on total discount of a product in cash desk
|
2020-09-30 15:09:45 +02:00 |
|
Laurent Destailleur
|
1d6a4f528a
|
Fix css
|
2020-09-24 00:07:55 +02:00 |
|
Laurent Destailleur
|
a16788f753
|
Fix syntax error
|
2020-09-24 00:06:02 +02:00 |
|
Laurent Destailleur
|
32a93eb067
|
Update invoice.php
|
2020-09-23 19:50:39 +02:00 |
|
jove@bisquerra.com
|
c596f80fd5
|
NEW Show available stock in TakePOS
|
2020-09-20 23:29:59 +02:00 |
|
Laurent Destailleur
|
e5cca13ea0
|
Fix escaping
|
2020-09-20 03:32:43 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
295c2b1d17
|
FIX #yogosha4435
|
2020-09-16 17:56:26 +02:00 |
|
Scrutinizer Auto-Fixer
|
c263c8a76c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-08 19:27:28 +00:00 |
|
Scrutinizer Auto-Fixer
|
b78ff67d7e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-07 08:18:17 +00:00 |
|
Laurent Destailleur
|
54c1be3717
|
Merge pull request #14560 from ptibogxiv/patch-349
NEW display resiliate status in takepos for member
|
2020-08-31 16:16:39 +02:00 |
|
ptibogxiv
|
6eeb1d3a96
|
Update invoice.php
|
2020-08-29 13:36:52 +02:00 |
|
stickler-ci
|
eecab28203
|
Fixing style errors.
|
2020-08-26 10:22:33 +00:00 |
|
ptibogxiv
|
989130c0ad
|
Update invoice.php
|
2020-08-26 12:20:49 +02:00 |
|
ptibogxiv
|
76e276e8e8
|
Update invoice.php
|
2020-08-26 12:00:45 +02:00 |
|
stickler-ci
|
32ecf4dd9a
|
Fixing style errors.
|
2020-08-26 09:46:49 +00:00 |
|
ptibogxiv
|
66cdb1dad0
|
NEW display resiliate status in takepos for member
|
2020-08-26 11:44:35 +02:00 |
|
andreubisquerra
|
8f933c324a
|
Change variable to pos_change
|
2020-08-23 22:28:26 +02:00 |
|
jove@bisquerra.com
|
d9cbd8f998
|
NEW: Print payment method and change in TakePOS
|
2020-08-22 18:28:15 +02:00 |
|
Laurent Destailleur
|
25dfd32e0b
|
Merge pull request #14456 from andreubisquerra/master
NEW: Delayed payment in TakePOS
|
2020-08-19 14:36:34 +02:00 |
|
Laurent Destailleur
|
ea478721e7
|
Update invoice.php
|
2020-08-19 14:36:03 +02:00 |
|
Laurent Destailleur
|
f57f729d40
|
Update invoice.php
|
2020-08-19 14:35:15 +02:00 |
|
andreubisquerra
|
8c5a86cb72
|
Avoid empty sales and orders when all lines are removed.
|
2020-08-12 07:07:18 +02:00 |
|
jove@bisquerra.com
|
3be723f3a1
|
NEW: Delayed payment in TakePOS
|
2020-08-11 07:49:54 +02:00 |
|
Laurent Destailleur
|
6fd433167f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2020-08-07 11:59:55 +02:00 |
|
jove@bisquerra.com
|
022fb23cee
|
FIX: Get some taxes in TakePOS
|
2020-08-07 10:01:11 +02:00 |
|
Laurent Destailleur
|
01babc452c
|
More logs
|
2020-08-06 03:52:49 +02:00 |
|
jove@bisquerra.com
|
593c7242c4
|
NEW: TakePOS Gift Receipt
|
2020-08-02 11:13:41 +02:00 |
|
Laurent Destailleur
|
cb5577826d
|
Look and feel v13
|
2020-07-07 03:50:14 +02:00 |
|
Laurent Destailleur
|
bb74804b74
|
NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
|
2020-06-29 17:58:04 +02:00 |
|
Laurent Destailleur
|
c54294285a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
|
2020-06-20 12:28:14 +02:00 |
|
Laurent Destailleur
|
d632f1c6b2
|
Fix url
|
2020-06-19 23:08:29 +02:00 |
|
andreubisquerra
|
7e792928e0
|
Update invoice.php for Auto Order
|
2020-05-26 23:03:47 +02:00 |
|
Laurent Destailleur
|
40816c02ce
|
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-25 22:40:59 +02:00 |
|
andreubisquerra
|
221e8d8ce1
|
invoice.php improvements
|
2020-05-24 16:30:42 +02:00 |
|
Frédéric FRANCE
|
5aa84c64d0
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:54:33 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
ee6fadd0d5
|
add new rule
|
2020-05-21 01:41:27 +02:00 |
|
jove@bisquerra.com
|
0847f5350a
|
TakePOS Auto Order improvements
|
2020-05-15 23:44:19 +02:00 |
|
Scrutinizer Auto-Fixer
|
9699ee7263
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-05-15 11:55:31 +00:00 |
|
Laurent Destailleur
|
bc581ead3b
|
Merge branch 'develop' into master
|
2020-05-14 16:17:37 +02:00 |
|
Laurent Destailleur
|
c89e8efec3
|
responsive
|
2020-05-12 14:08:28 +02:00 |
|
jove@bisquerra.com
|
b93a3ceb29
|
TakePOS Auto Order improvements
|
2020-05-08 17:25:48 +02:00 |
|
andreubisquerra
|
ac75cf318e
|
Fix travis
|
2020-05-03 00:07:04 +02:00 |
|
jove@bisquerra.com
|
81c808692e
|
NEW Bar Restaurant tab and Auto order
|
2020-05-02 22:00:04 +02:00 |
|
jove@bisquerra.com
|
4dbd16077e
|
Finish send receipt by email from TakePOS
|
2020-04-30 01:10:12 +02:00 |
|
Laurent Destailleur
|
c7fab6a83e
|
Fix no tooltip of not predefined products
|
2020-04-20 13:26:06 +02:00 |
|