Commit Graph

176 Commits

Author SHA1 Message Date
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
97bb04c5b0
Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-18 16:31:51 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
2021-09-16 13:40:05 +02:00
Laurent Destailleur
b1cb32c743 Fix some sql 2021-09-15 20:03:38 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
a8f4eef0f6
Merge pull request #18445 from erikvanberkum/develop
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1.
2021-08-28 18:40:54 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Erik van Berkum
a0dc6ca394 Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1. Adjusted visible to -2 2021-08-24 23:12:04 +09:00
Adrien Raze
6de7d9b0af NEW : Add sub-BOM lines on BOM card 2021-08-20 13:37:28 +02:00
Erik van Berkum
e570c22398 Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1. 2021-08-19 17:09:18 +09:00
Laurent Destailleur
5853aa4c1e Look and feel v14 2021-07-04 20:08:34 +02:00
Laurent Destailleur
594f7c8e9e Fix code for v14 2021-06-24 09:54:30 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
f655cab5eb Clean code 2021-05-06 21:11:39 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
a8c34a5b05 Invert MAIN_EXTRAFIELDS_USE_SELECT2 into
MAIN_EXTRAFIELDS_DISABLE_SELECT2
2021-03-15 14:16:55 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
lmarcouiller
c00d64855a Fix #16524 : Add support disassemble BOM 2021-03-05 09:47:38 +01:00
Frédéric FRANCE
3c8089af0d
code syntax bom directory 2021-02-23 17:51:46 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Laurent Destailleur
3588781180 Debug v13 2020-11-26 14:15:20 +01:00
Frédéric FRANCE
154f0c7e8d
doxygen 2020-11-24 21:28:57 +01:00
Laurent Destailleur
d9f66e95b5 Fix missing field 2020-11-13 10:26:16 +01:00
Laurent Destailleur
ed8a0093ff Debug v13 2020-11-05 22:25:14 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
bb147d2599 FIX #15140 2020-10-25 14:12:34 +01:00
Laurent Destailleur
64b28020c8 Look and feel v13 2020-09-11 13:14:14 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
florian HENRY
e44a1fd33f ->error rather than dol_print_error into product 2020-07-31 16:09:38 +02:00
Laurent Destailleur
4fd970af28 Fix phpcs 2020-07-07 01:29:31 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
c460cff01c Fix calculation and add tooltip to understand it. 2020-05-23 01:17:01 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
830a117aa7 Suggest fix for #13824 2020-05-07 23:39:03 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00: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
bcbccf0c83 Start working on bom cost 2020-03-24 10:32:31 +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
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
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
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
Maxime Kohlhaas
83928b4708 Fix duration must be double(24,8) to store seconds 2019-12-01 18:19:22 +01:00
Norbert Penel
88c0c51396
wrong object line
was not working with units
2019-11-30 20:03:14 +01:00
Laurent Destailleur
16d67a1a8e Fix several trouble with some types in modulebuilder
Fix difference between null and 0
2019-11-17 17:36:36 +01:00
Laurent Destailleur
dc77a58a73 Work on MO 2019-11-12 01:48:12 +01:00
Scrutinizer Auto-Fixer
038bda254d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 22:59:36 +00:00
Laurent Destailleur
eb378b45a4 Work on BOM - MO module 2019-11-09 20:35:45 +01:00
Laurent Destailleur
5b6ace387e Debug BOM and MO module 2019-11-09 19:47:49 +01:00
Laurent Destailleur
d972fa8bcb Fix pb with model_pdf 2019-11-05 20:20:57 +01:00
Laurent Destailleur
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
a0db0fccbe Debug BOM 2019-11-04 15:56:45 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Philippe Grand
12faebd63f
Update bom.class.php 2019-11-01 11:15:26 +01:00
stickler-ci
0c6938aa2a Fixing style errors. 2019-11-01 09:44:29 +00:00
Philippe GRAND
c851a9faff add some comment 2019-11-01 10:38:58 +01:00
Laurent Destailleur
afa3ed499f Can export BOMs 2019-10-27 15:56:20 +01:00
Laurent Destailleur
eb112d4012 Add qty frozen and disable stock change flag on BOM 2019-10-27 01:49:31 +02:00
Laurent Destailleur
e17cc5b2e5 Debug cloning of BOMs 2019-10-27 00:26:11 +02:00
Laurent Destailleur
7d6306dfa8 Look and feel v11 2019-10-24 13:09:50 +02:00
Laurent Destailleur
1ea3865f0d Look and feel v11 2019-10-24 13:01:03 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Laurent Destailleur
eb525769be Fix link to user 2019-10-17 20:32:11 +02:00
Laurent Destailleur
bca3bc4436 Fix link to user 2019-10-17 20:30:17 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
012ddd1cdc Fix bom 2019-10-16 18:37:26 +02:00
Laurent Destailleur
ffc4820970 Fix counter of BOM 2019-10-16 02:05:23 +02:00
Laurent Destailleur
d3df04c5aa Mutualize code 2019-10-16 01:36:07 +02:00
Laurent Destailleur
b0355dd149 Module BOM have now status DRAFT, VALIDATED, DISABLED 2019-10-16 01:20:58 +02:00
Laurent Destailleur
e94d47daf7 Work on MRP module 2019-10-15 19:57:23 +02:00
Laurent Destailleur
7973b03201 NEW Add estimated duration on the BOM module 2019-10-14 11:38:36 +02:00
Laurent Destailleur
b5a2d37315 Fix phpunit of BOM 2019-10-11 16:10:09 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved
FIX Permission for BOM menu
2019-07-09 00:14:01 +02:00
Laurent Destailleur
a33071d779 FIX #11421 2019-06-28 12:52:35 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
6d38f5ec9c FIX #11369 2019-06-20 02:56:44 +02:00