Commit Graph

469 Commits

Author SHA1 Message Date
Laurent Destailleur
d07669a92c Debug v17 2022-12-16 12:04:37 +01:00
Laurent Destailleur
a673bdba15 Debug v17, on supplier, default vat rate is sale if no price found 2022-12-13 20:06:56 +01:00
Laurent Destailleur
44627f0caa Debug v17 2022-12-04 18:52:11 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-11-16 20:35:29 +01:00
ptibogxiv
5218b2f804
Fix token error in pice.php 2022-11-11 12:44:20 +01:00
bomuux
8981020fa1
BUG: can't update product_price_by_qty
a typo in update query.
2022-11-02 18:18:53 +01:00
Laurent Destailleur
fc64bcf56f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-21 13:22:27 +02:00
Laurent Destailleur
2db3f6f709 Fix price style 2022-10-20 18:23:41 +02:00
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +02:00
Laurent Destailleur
7485188b49
Update price.php 2022-09-13 01:11:09 +02:00
Thomas Negre
3d88e8cc0e add tr ids 2022-09-12 15:19:17 +02:00
Thomas Negre
56c2b8b775 Product: display TTC price on price card 2022-09-12 15:19:12 +02:00
Frédéric France
705b436494 replace other deprecated 2022-09-10 14:03:47 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
ec042b1701 css 2022-08-10 14:32:26 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
2022-07-10 19:28:16 +02:00
Laurent Destailleur
61f1595f8c Fix look and feel v15 2022-07-08 11:21:54 +02:00
Laurent Destailleur
3bb8e9cdda Debug v16 2022-06-09 12:07:35 +02:00
lmarcouiller
207ebc9266 fix php 8.0 warnings 2022-05-11 15:06:11 +02:00
Laurent Destailleur
f222328ff8 FIX Update of sale price (log not correctly updated) 2022-05-06 12:37:18 +02:00
Laurent Destailleur
203c4e8082 Fix bad test 2022-05-06 11:48:15 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Laurent Destailleur
583343a171 Clean code 2022-05-06 05:08:54 +02:00
Laurent Destailleur
afdefad55b FIX bad link to add a customer price (token duplicated) 2022-04-06 21:01:04 +02:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:04:31 +01:00
Marc de Lima Lucio
e989371651 FIX: better error management at product selling price update 2022-03-08 14:49:26 +01:00
Laurent Destailleur
047c55bd02 Fix look and feel v15 2022-01-28 08:49:47 +01:00
Laurent Destailleur
d9b0af616e Fix the localtax were not saved on price when no code was set 2022-01-20 18:51:14 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
0674a48cb5 Fix missing total and missing css 2022-01-05 19:58:08 +01:00
Laurent Destailleur
0dcbd458b8 FIX default_vat_code was not returned in some Ajax services of products 2021-11-23 13:08:00 +01:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +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
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/list.php
2021-08-24 16:37:18 +02:00
Laurent Destailleur
ba594b20e0 Fix phpcs 2021-08-24 16:36:27 +02: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
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/price.php
2021-08-24 15:00:35 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
bdf8c3ddc6 Fix test 2021-08-20 23:26:56 +02:00
Laurent Destailleur
9d285ea232 Fix: Can delete a price when date is in future to fix corrupted data 2021-08-20 21:11:20 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
f3dbe81df4 FIX Can't set cost price when product is not on purchase 2021-08-09 20:02:24 +02:00
Laurent Destailleur
6a9217474d FIX Can't set cost price when product is not on purchase 2021-08-09 20:01:06 +02:00