Commit Graph

628 Commits

Author SHA1 Message Date
Laurent Destailleur
283ad1abcf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
stickler-ci
4ee0ede6d8 Fixing style errors. 2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9 FIX: Errors Handling for CreateFrom Hooks 2023-01-18 09:44:23 +01:00
Laurent Destailleur
68e4e71005 FIX: Amount of localtax1 and 2 not correctly save on purchase order (the
rate was saved instead)
2023-01-06 12:08:40 +01:00
Laurent Destailleur
77898ab456 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 11:52:33 +02:00
Laurent Destailleur
8fdf4876d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-06 15:39:10 +02:00
Laurent Destailleur
a73aa6c0df Fix bad muticurrency rate 2022-10-05 09:55:51 +02:00
Laurent Destailleur
f032a89c49
Merge pull request #21566 from FHenry/15_fix_21553
fix: #21553, fourn prod Id is required to find packaging value
2022-07-24 15:50:17 +02:00
Laurent Destailleur
4b562121ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 14:33:02 +02:00
Laurent Destailleur
8e1d80e294
Merge pull request #21564 from FHenry/15_fix_21553
fix: #21553 fourn prod Id is required to find packaging value
2022-07-24 00:01:40 +02:00
Florian HENRY
3af167db6c fix: #21553, fourn prod Id is required to find emballage value 2022-07-23 13:54:07 +02:00
spooky360
5d75ea015b
Added "$object" parameter to $formfile->showdocuments call
Added "$object" parameter to $formfile->showdocuments call in order to use the $object reference on the showDocuments hook called inside showdocuments function.
Otherwise, the hook is called with a null reference.
2022-07-22 09:51:57 +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
941245c5e2 Debug v16 2022-06-28 12:26:49 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Alexandre SPANGARO
c6a8242e76 Look & Feel v16 - Align amount to right on card 2022-06-25 07:09:24 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
lmarcouiller
2d13b47441 fix php8.0 warnings 2022-05-31 11:36:54 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
2b65ba4a45 FIX insert free price using price without tax on order 2022-02-10 15:03:41 +01:00
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +01:00
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	build/docker/docker-compose.yml
2022-01-23 18:52:47 +01:00
Laurent Destailleur
acafc69baa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 16:13:20 +01:00
Laurent Destailleur
251609eb26 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:27 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
22a3b5ea78 FIX deletion of supplier order when draft 2022-01-18 16:24:28 +01:00
Laurent Destailleur
200f796232 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-18 16:08:54 +01:00
Laurent Destailleur
75eb256589 Fix perm to delete a draft supplier order 2022-01-18 16:06:27 +01:00
lvessiller
a9c76f2e44 FIX replace print error with event message when error on update line in supplier order 2022-01-14 16:09:30 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
2022-01-14 10:30:39 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Laurent Destailleur
18978ac84e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-01-06 16:08:49 +01:00
BENKE Charlene
883d6bd63a
Update card.php 2022-01-04 09:32:27 +01:00
BENKE Charlene
0bc33ef3b3
Create card.php 2022-01-04 09:26:10 +01:00
stickler-ci
4e1d4ea1ca Fixing style errors. 2022-01-04 08:23:49 +00:00
BENKE Charlene
e73573d7c4
fix : allow create from other external modules 2022-01-04 09:18:28 +01:00
Je2fb
369d125002
Update card.php
Fix bug when you create a supplier order from a project to keep the project when you select the supplier (Option RELOAD_PAGE_ON_SUPPLIER_CHANGE)
2021-12-23 22:47:30 +01:00
lmarcouiller
0fc9be27bc Fix #19545 : supplier order modification 2021-12-10 11:26:19 +01:00
Jay Yeo
63c7ab0302 Fix typo 'usercanreceived' -> 'usercanreceive' in 'card.php' 2021-12-01 14:29:24 +07:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00