Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
stickler-ci
fb79aaeb0c
Fixing style errors.
2021-10-15 07:19:49 +00:00
Henry
316bc16634
Update card.php
2021-10-15 15:05:13 +08:00
lvessiller
be4a00213c
FIX optional visibility on create card
2021-10-08 15:58:08 +02:00
Laurent Destailleur
2cb0edb5eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/project/suggestbooth.php
htdocs/public/project/suggestconference.php
2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/fourn/facture/card.php
2021-10-07 11:00:00 +02:00
Laurent Destailleur
e3032ef1c4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/fourn/facture/card.php
2021-10-06 16:06:25 +02:00
Laurent Destailleur
10f0434116
Update card.php
2021-10-06 15:30:19 +02:00
Florian HENRY
6d00097c89
fix
2021-09-30 16:37:52 +02:00
Florian HENRY
d0508d557b
fix: checkbox for line selection between supplier order and supplier invoice was infective
2021-09-30 14:56:02 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
51b6318f88
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:14:01 +02:00
Laurent Destailleur
1e0a7e4342
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:10:39 +02:00
lvessiller
991a7ffd43
FIX selected lines on supplier invoice create
2021-09-21 11:04:59 +02:00
Laurent Destailleur
d760686239
Fix case of newtoken()
2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a
Fix add action delete* as sensitive action
2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469
Fix Add action classify as sensitive actions
2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
034c5651c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
30856d5b18
FIX Relative discount with high nb of decimals
2021-09-08 22:09:02 +02:00
Laurent Destailleur
c4621f0433
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8
Backport sql injection fix from develop
2021-09-03 18:00:28 +02:00
Laurent Destailleur
77e9f15360
Work on #18448
2021-09-02 22:52:17 +02:00
Laurent Destailleur
8600d8d00d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-01 22:50:06 +02:00
henrynopo
7bf6daaca7
Update card.php
2021-08-30 15:33:26 +08:00
Laurent Destailleur
301d7134b3
Merge branch 'develop' into patch-2
2021-08-28 17:37:54 +02:00
stickler-ci
63427638d8
Fixing style errors.
2021-08-28 14:54:16 +00:00
henrynopo
444786b34f
Update card.php
2021-08-28 22:52:06 +08:00
Laurent Destailleur
0db67b40a0
Merge pull request #18525 from cfoellmann/PR/thirdparty-links
...
change links for thirdparty to target the type customer|supplier tab
2021-08-28 15:27:13 +02:00
Laurent Destailleur
2dd91bf312
Clean code
2021-08-27 23:36:06 +02:00
Laurent Destailleur
3b6559b1a6
Clean code by adding cast int.
2021-08-27 18:53:45 +02:00
Christian Foellmann
9752501ef6
change links for thirdparty to target the type customer|supplier tab
2021-08-27 15:32:53 +02:00
henrynopo
054b466e0a
Update card.php
2021-08-26 09:40:44 +08:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
...
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
henrynopo
73c0471ead
Fix error of supplier invoice (variable amount)
...
This update fixed the coding error for addline of deposit invoice for variable amount.
In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
2021-08-24 15:12:15 +02:00
henrynopo
b4096dc057
Fix error of supplier invoice (variable amount)
...
This update fixed the coding error for addline of deposit invoice for variable amount.
In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
2021-08-22 13:26:46 +08:00
Christian Foellmann
d706c3b1ec
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
2021-08-20 14:41:30 +02:00
stickler-ci
ee65860b27
Fixing style errors.
2021-08-16 01:45:33 +00:00
henrynopo
76c39a86a0
Supplier Invoice - Multicurrency remainder to pay
...
Added multicurrency remainder to be paid.
2021-08-16 09:44:09 +08:00
Laurent Destailleur
b7c42c70ef
Fix date for planned entries
2021-07-09 13:33:37 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
77efbda148
Fix responsive
2021-06-10 20:04:21 +02:00
Frédéric FRANCE
4e530c2486
Update card.php
2021-06-08 12:05:45 +02:00
Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339
...
Update card.php
2021-06-04 10:35:11 +02:00
Laurent Destailleur
350a421544
Update card.php
2021-06-04 08:41:26 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode
2021-06-03 21:47:10 +02:00
UT from dolibit
7aae5be54a
Update card.php
2021-05-31 10:36:43 +02:00