Commit Graph

966 Commits

Author SHA1 Message Date
Laurent Destailleur
239f7a1eb0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-13 13:58:03 +01:00
Laurent Destailleur
927a87851d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-13 13:57:02 +01:00
Laurent Destailleur
802ee770c3 FIX #23860 2023-02-09 19:25:55 +01:00
Laurent Destailleur
deb110d556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-03 02:35:13 +01:00
Laurent Destailleur
10674a59bb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-03 02:33:59 +01:00
Laurent Destailleur
af45ef8799
Merge pull request #23294 from atm-gauthier/fix_multicurrency_when_create_order_from_propal
FIX : get multicurrency infos of propal when create order from propal…
2023-01-03 01:36:57 +01:00
Eric Seigne
2aa271d96e avoid editretainedwarranty if invoice is not draft 2022-12-28 17:50:16 +01:00
Gauthier PC portable 024
a48d1ae8e3 FIX : multicurrency_tx and not currency_tx 2022-12-21 12:31:24 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
stickler-ci
24585cf61b Fixing style errors. 2022-12-14 02:45:20 +00:00
Henry
c4dbc5e6d6
Create invoice from Shipment - fix error of multicurrency code 2022-12-14 10:39:15 +08:00
Laurent Destailleur
ff33a1852f FIX Remove use of code we should not have 2022-10-06 20:22:43 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Laurent Destailleur
118b975f91 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 11:56:05 +02:00
priojk
03f6df206b improve formatting 2022-09-24 17:27:38 +02:00
Regis Houssin
f5fe366525 FIX broken feature, wrong fk_parent_line 2022-09-16 15:03:53 +02:00
Laurent Destailleur
aa560db06d Fix regression 2022-09-07 13:58:24 +02:00
This Charlène
0886f85579
Update card.php 2022-09-07 08:57:51 +02:00
This Charlène
bfb93609dd
php V8 Warning 2022-09-07 08:56:02 +02:00
Alexandre SPANGARO
ae449dfe0f Use isModEnabled 2022-08-29 12:01:36 +02:00
Alexandre SPANGARO
4075397f7a Use isModEnabled 2022-08-29 11:23:50 +02:00
Laurent Destailleur
498ed449e9 Fix label of invoice status 2022-08-13 12:03:41 +02:00
Laurent Destailleur
ef387e1a02 Fix token 2022-08-12 23:19:36 +02:00
Regis Houssin
b20144c3d0 FIX php8 compatibility 2022-08-08 11:39:43 +02:00
Laurent Destailleur
c545756b6e
Revert "FIX : VAT rate recalculation" 2022-08-03 17:06:19 +02:00
jpb
cec9725ced FIX : VAT rate recalculation
set a checkbox on clone formquestion
2022-08-01 16:28:44 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
a0caf7be71
Merge pull request #21394 from cfoellmann/PR/improve-page-titles
fix page titles
2022-07-06 15:55:10 +02:00
Laurent Destailleur
f6b0710baf FIX Can convert a partially closed down payment when close for
bankcharge
2022-07-05 21:04:24 +02:00
Laurent Destailleur
5e451e1155 FIX Can convert a partially closed down payment when close for
bankcharge
2022-07-05 20:59:42 +02:00
Laurent Destailleur
c3f6833add css 2022-07-05 20:32:22 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
bbd2f05e3a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-06-27 12:11:40 +02:00
Christian Foellmann
55d90ec560 set the target for SOC links on proposals and invoices to the customer tab 2022-06-25 16:24:55 +02:00
Laurent Destailleur
227ac2baae
Merge pull request #21172 from aspangaro/17p2
Look & Feel - Align amount to right on card
2022-06-17 18:07:30 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-17 14:52:51 +02:00
Laurent Destailleur
18d9d6194e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-17 14:48:27 +02:00
Thomas Negre
3fcaae5ae3 fix private notes not being registered on credit/replacement invoices 2022-06-16 15:33:25 +02:00
Alexandre SPANGARO
863a18b839 Merge remote-tracking branch 'upstream/develop' into 17p2 2022-06-15 04:16:40 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Alexandre SPANGARO
61d5e89677 Look & Feel - Align amount to right on card 2022-06-09 04:01:02 +02:00
Laurent Destailleur
7f3826609a Fix var not defined 2022-06-03 14:34:38 +02:00
Laurent Destailleur
309eccc426 Fix phpcs 2022-06-03 14:08:04 +02:00
Laurent Destailleur
f53060fec3 FIX selection of type of invoice 2022-06-02 19:43:41 +02:00
Laurent Destailleur
9df4e4dcb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-02 19:40:06 +02:00
Laurent Destailleur
cbead0fa5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +02:00
Laurent Destailleur
f9f902f7f4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00