Commit Graph

706 Commits

Author SHA1 Message Date
Laurent Destailleur
e454ee783f Fix phpcs 2020-04-10 10:53:03 +02:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
BENKE Charlene
728bfd1c90 oups ssooory
everything fine thank's
2020-04-08 19:46:29 +02:00
BENKE Charlene
732a103ba8 add linked object block 2020-04-08 15:30:48 +02:00
Laurent Destailleur
b407797ca3 Fix css 2020-03-31 17:45:45 +02:00
Maxime Kohlhaas
83b5b82147 Merge branch 'new_bom_cost' of github.com:atm-maxime/dolibarr into new_bom_cost 2020-03-30 10:34:23 +02:00
Maxime Kohlhaas
8e4e1002f9 Missing return comment 2020-03-30 10:33:48 +02:00
stickler-ci
3a349e6533 Fixing style errors. 2020-03-30 08:25:57 +00:00
Maxime Kohlhaas
b0e7bd8a30 Finish BOM cost calculation 2020-03-30 10:20:56 +02:00
Maxime Kohlhaas
436fcd39d4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_bom_cost 2020-03-30 10:20:45 +02:00
Laurent Destailleur
5fad4c8cb4 CSS 2020-03-29 19:41:01 +02:00
Maxime Kohlhaas
0512b3a7a7 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_bom_cost 2020-03-28 16:37:39 +01:00
Laurent Destailleur
259f23e96b Look and feel v11 2020-03-27 11:56:45 +01:00
Laurent Destailleur
fd3d13cfcf Look and feel v11 2020-03-27 11:15:38 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Maxime Kohlhaas
bcbccf0c83 Start working on bom cost 2020-03-24 10:32:31 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
7866f89585 Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Laurent Destailleur
bfb9739ae8 Fix manufacuring efficiency on bom lines. 2020-02-28 16:12:42 +01:00
Laurent Destailleur
be3ecb3093 Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless 2020-02-21 14:32:53 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
97d726733c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/includes/tecnickcom/tcpdf/tcpdf.php
2020-02-03 06:36:43 +01:00
Laurent Destailleur
e5808e3335 FIX #12995 2020-02-03 04:48:17 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
4510ef488e doc modulebuilder 2020-01-25 22:43:56 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
78dcf91f02 Fix bad link 2020-01-09 22:42:31 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
115b7f2c6b Fix break on second column 2020-01-09 11:05:23 +01:00
Laurent Destailleur
0802df78b5 Debug MRP 2020-01-08 17:56:02 +01:00
Laurent Destailleur
cc8000a255 Removed not used files 2019-12-23 20:39:36 +01:00
Laurent Destailleur
2dee5e6bf1 Fix delay and useless code 2019-12-21 14:35:39 +01:00
Laurent Destailleur
c0ef3b46ad Work on MRP module 2019-12-20 15:31:05 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Maxime Kohlhaas
83928b4708 Fix duration must be double(24,8) to store seconds 2019-12-01 18:19:22 +01:00
Maxime Kohlhaas
b1a8e39e7f Add product line label 2019-12-01 17:45:01 +01:00
Laurent Destailleur
df5ef99f4f Merge pull request #12543 from frederic34/patch-6
The condition $nolinesbefore is always true.
2019-12-01 00:47:33 +01:00
Norbert Penel
88c0c51396 wrong object line
was not working with units
2019-11-30 20:03:14 +01:00
Laurent Destailleur
eb69538d17 Fix if we insert a product already the product to produce 2019-11-29 23:51:46 +01:00
Frédéric FRANCE
0ac8444b12 The condition $nolinesbefore is always true. 2019-11-28 21:12:16 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
24bb345ee1 Fix bad name of function 2019-11-22 15:35:19 +01:00
Scrutinizer Auto-Fixer
1eab97080c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-22 14:13:30 +00:00