lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

709 Commits

Author SHA1 Message Date
Quentin VIAL-GOUTEYRON
9ed75d01bd fix missing token on mo card 2022-05-23 12:43:30 +02:00
Quentin VIAL-GOUTEYRON
48151b47a6 FIX mvt origin 2022-05-23 12:31:37 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
755bce9fe1 Fix : date_creation must have visible=-2 2022-05-21 00:22:47 +02:00
Maxime Kohlhaas
cff5ec8605 Fix : fields must check module enabled 2022-05-21 00:08:18 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
stickler-ci
2d1615de27 Fixing style errors. 2022-05-11 15:22:16 +00:00
atm-lena
1555a6540b Translation 2022-05-11 12:40:51 +02:00
atm-lena
e716c9abd6 Force to warehouse for consume produt in mo 2022-05-11 12:38:24 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
atm-lena
2f03a15956 FIX missing escape() 2022-04-22 08:47:57 +02:00
atm-lena
b58c1c37db Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_of_consumption_selectbatch 2022-04-11 08:55:41 +02:00
kevin
6a8e3761c3 Resolve merge conflicts 2022-04-08 09:54:17 +02:00
kevin
135e4f1768 Add tooltip to explain the trash action 2022-04-08 09:50:40 +02:00
stickler-ci
de6e3c6d55 Fixing style errors. 2022-04-06 13:19:34 +00:00
kevin
69eaf1e708 Rework some code 2022-04-06 14:59:18 +02:00
kevin
8be5cccb4e Reverse stock movements on mo consumed product 2022-04-06 12:32:10 +02:00
Laurent Destailleur
0fde73b4bc
Merge pull request #20405 from elsp1991/fix/pmp_price_of_produced_prod_mrp 
FIX MO produced product WAP calculation when MO is based on BOM (not free lines)
 2022-03-24 14:29:33 +01:00
Laurent Destailleur
38439603be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 13:23:04 +01:00
Laurent Destailleur
ef204b2620 Fix column conditions 2022-03-24 12:52:04 +01:00
Ilias Patsiaouras
b666ec2142 removing dead code free and bom lines are MO lines 2022-03-18 13:46:40 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Regis Houssin
193a073b16 FIX missing multientity managed 2022-03-11 11:18:09 +01:00
atm-lena
5c576d0ae5 FIX updateselectwarehousebybatch : request sql must take batch, no id + fix delete condition 2022-03-08 11:21:04 +01:00
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Florian HENRY
3b06a08aa0 FIX: User name in ManufacturingOrder 2022-03-03 13:56:10 +01:00
John Livingston
1ece554c92
Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
atm-lena
5072f69ee9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_of_consumption_selectbatch 2022-02-25 13:45:13 +01:00
atm-lena
49545228c8 Travis 2022-02-22 11:59:00 +01:00
atm-lena
5cf723e7a5 Ret Travis 2022-02-22 11:50:47 +01:00
atm-lena
45fe83289f MoChild category 2022-02-22 11:32:33 +01:00
atm-lena
ce12442c36 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:22:41 +01:00
atm-lena
e5039a67b0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-02-21 10:22:22 +01:00
stickler-ci
cf2f2c283b Fixing style errors. 2022-02-21 09:17:20 +00:00
atm-lena
27c70466c2 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:14:19 +01:00
atm-lena
f177973efe Don't create Mo Child if it's only a product line on BOM 2022-02-21 10:13:25 +01:00
stickler-ci
e02b82e346 Fixing style errors. 2022-02-21 09:09:39 +00:00
atm-lena
0cbf374fa5 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-21 10:06:30 +01:00
atm-lena
c4a8bffa48 FIX Travis : global $db 2022-02-21 10:05:18 +01:00
stickler-ci
7e6a5d5792 Fixing style errors. 2022-02-17 10:13:30 +00:00
atm-lena
c2bc3b20bb Don't display collapse if no bom on bomline 2022-02-17 11:05:03 +01:00
Frédéric FRANCE
c8640f329e
add missing global 2022-02-15 18:31:05 +01:00
atm-lena
398927f2c8 Clean Code 2022-02-15 16:24:39 +01:00
atm-lena
382aaf8538 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 16:08:32 +01:00
atm-lena
498d56319d Clean Code 2022-02-15 16:08:18 +01:00
stickler-ci
bbd0925c9e Fixing style errors. 2022-02-15 14:41:54 +00:00
atm-lena
452ec0bdfb WIP : search MOParent in MO List 2022-02-15 15:38:24 +01:00
atm-lena
c40b7afca2 Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 15:04:02 +01:00
atm-lena
9e5d5a6295 WIP : fix fetch mo parent to create mo child 2022-02-15 15:03:21 +01:00
stickler-ci
26eb0fbf82 Fixing style errors. 2022-02-15 13:52:45 +00:00
atm-lena
81e75f401e Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 14:49:34 +01:00
atm-lena
2ba0af0d0b Parent MO List Mo : wip 2022-02-15 14:49:16 +01:00
stickler-ci
915a135c64 Fixing style errors. 2022-02-15 11:46:50 +00:00
atm-lena
1931ad3bab Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child 2022-02-15 12:43:42 +01:00
atm-lena
0f4b1e1d7a WIP 2022-02-15 11:46:30 +01:00
atm-lena
5b8d80ab17 FIX SQL request 2022-02-14 10:19:36 +01:00
atm-lena
c5b859759d Merge branch 'develop_of_consumption_selectbatch' of github.com:atm-lena/dolibarr into develop_of_consumption_selectbatch 2022-02-11 11:37:48 +01:00
atm-lena
1307afcddf FIX (int) sql request 2022-02-11 11:37:13 +01:00
stickler-ci
b80e9a9bdc Fixing style errors. 2022-02-08 15:37:23 +00:00
atm-lena
27cbd16bb9 Clean code 2022-02-08 16:01:18 +01:00
atm-lena
8db75f0d04 WIP 2022-02-08 15:54:31 +01:00
atm-lena
6a94a6ebac Ajout case à cocher "Générer OF Enfant" 2022-02-07 17:00:49 +01:00
atm-lena
f921c10e3a Gestion js : déroulement des sous bom 2022-02-07 16:28:58 +01:00
atm-lena
5c862435a8 Ajout ligne BOM enfant dans mo_card action "create" 2022-02-07 16:06:25 +01:00
stickler-ci
09efa97a31 Fixing style errors. 2022-02-07 10:00:17 +00:00
atm-lena
ed2ff38318 Merge branch 'develop_of_consumption_selectbatch' of github.com:atm-lena/dolibarr into develop_of_consumption_selectbatch 2022-02-07 10:57:50 +01:00
atm-lena
19dd137462 Permission and correct merge conflict error 2022-02-07 10:55:33 +01:00
stickler-ci
390d8694da Fixing style errors. 2022-02-02 14:38:33 +00:00
atm-lena
952d77c8e1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_of_consumption_selectbatch 2022-02-02 15:34:25 +01:00
Laurent Destailleur
cd1f5fead1 phpcs 2022-01-26 13:51:56 +01:00
atm-lena
fd1fd82e5d Clean 2022-01-26 09:53:34 +01:00
atm-lena
ccacf2e89a Clean code 2022-01-26 09:49:06 +01:00
atm-lena
25e8a2c758 Ajout interface.php 2022-01-26 09:40:15 +01:00
atm-lena
2ea5da3e13 WIP 2022-01-25 17:16:21 +01:00
Quentin VIAL-GOUTEYRON
4de5ee97b3 NEW : split consumption line on MO 2022-01-25 16:37:33 +01:00
atm-lena
a5ab9e059a WIP : clean code 2022-01-25 16:25:53 +01:00
Quentin VIAL-GOUTEYRON
8cf1991d64 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Multiple_batch_consume 2022-01-25 15:08:03 +01:00
atm-lena
f0942a5ac6 WIP 2022-01-25 12:33:28 +01:00
atm-lena
d436d7af83 WIP 2022-01-24 18:23:26 +01:00
atm-lena
1f2f12717f WIP 2022-01-24 17:36:39 +01:00
atm-lena
1f591c20b1 MO Cosumption selectors auto : WIP 2022-01-24 15:19:47 +01:00
Quentin VIAL-GOUTEYRON
84d446cf73 NEW possibility to consume multiple batch 2022-01-21 15:31:30 +01:00
atm-lena
378473ca1f OF Consumption batch select : WIP 2022-01-21 12:21:47 +01:00
atm-lena
d5f0fe6c10 OF consumption batch select : wip 2022-01-21 10:55:06 +01:00
stickler-ci
238e2111f0 Fixing style errors. 2022-01-20 16:07:18 +00:00
kevin
553dc5a1ef Display the physical and virtual stock of the products when creating OF from a BOM 2022-01-20 16:59:05 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Florian HENRY
59b1feaf2e fix include 2022-01-07 08:27:49 +01:00
Laurent Destailleur
144a56d073 Clean code 2022-01-06 18:12:02 +01:00
Laurent Destailleur
1e467c60f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/facture/list.php
	htdocs/product/stock/movement_list.php
 2022-01-06 11:15:28 +01:00
Laurent Destailleur
b381f24897 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/mrp/mo_movements.php
 2022-01-06 11:07:05 +01:00
Laurent Destailleur
518b163066 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/movement_list.php
 2022-01-06 11:01:27 +01:00
Ferran Marcet
08685cc6b0 Fix: Correctly display product translations 2022-01-03 13:14:40 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
ee428109e0 Debug 2021-12-19 01:36:45 +01:00
Laurent Destailleur
98ddfbf792 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/info.php
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/fourn/facture/list.php
	htdocs/mrp/mo_movements.php
	htdocs/product/stock/movement_card.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/replenishorders.php
	htdocs/reception/card.php
	htdocs/supplier_proposal/list.php
 2021-12-19 00:17:37 +01:00
Laurent Destailleur
6c053abfd9 Standardize code 2021-12-16 17:58:08 +01:00
Jay Yeo
41e4e70c6e Fix author searching include first and last name 2021-12-16 16:28:45 +07:00
Jay Yeo
7c1879a11a Fix author searching include first and last name 2021-12-15 16:52:57 +07:00
Laurent Destailleur
e113fe468f Clean code 2021-11-12 14:57:36 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Laurent Destailleur
a503a4dcc6 Fix scrutinizer 2021-10-23 22:12:57 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Lucas Marcouiller
f7923003e1 better fix for api_mos.class.php 2021-10-22 14:27:42 +02:00
Lucas Marcouiller
33e4d750d7 Fix: scrutinizer errors + boxes activation 2021-10-22 12:01:46 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
79177b0a11 Rename method into selectLotDataList 2021-10-17 14:38:12 +02:00
Laurent Destailleur
65e069a049 Fix var not initialized 2021-10-12 12:14:03 +02:00
Laurent Destailleur
eb73da5abc Fix set origin. 2021-10-12 12:04:43 +02:00
Laurent Destailleur
e1f5a39f48 Fix phpcs 2021-10-06 19:40:18 +02:00
Laurent Destailleur
e228f07877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/mrp/lib/mrp_mo.lib.php
 2021-10-06 18:41:51 +02:00
Laurent Destailleur
144de734ce Fix phpcs 2021-10-06 18:39:16 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Laurent Destailleur
d5d892b263
Merge pull request #18831 from SteiniGreenwork/develop 
NEW Can select existing batch numbers for a combo list (in mrp consumtion)
 2021-10-06 15:20:52 +02:00
Laurent Destailleur
7a9eb0baa7
Merge pull request #18911 from ksar-ksar/patch-10 
FIX #18910 : MRP List SQL query syntax error with more than one extrafileds.
 2021-10-06 14:10:37 +02:00
Rüdiger Hahn
d963aa8832 Allow removal of tabs 
For being able to remove or replace tabs, it is also necessary to call
this function with 'remove' mode.
 2021-10-06 13:35:34 +02:00
ksar
6a20fcc5c0
FIX #18910 2021-10-06 11:24:42 +02:00
stickler-ci
ced7c24c40 Fixing style errors. 2021-10-04 17:25:13 +00:00
Rüdiger Hahn
35aa9b0d35
Allow removal of tabs 
For being able to remove or replace tabs, it is also necessary to call this function with 'remove' mode.
 2021-10-04 19:19:12 +02:00
Stephan Steininger
3bb941f3b8
Merge branch 'Dolibarr:develop' into develop 2021-10-04 08:12:19 +02:00
Frédéric FRANCE
365f2ba31e
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:42:19 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Stephan Steininger
94cc75cb69 Changed input type from select to input. 
New function selectLot
 2021-09-30 13:56:43 +02:00
Stephan Steininger
372aa6bf4c
Merge branch 'Dolibarr:develop' into develop 2021-09-30 09:05:05 +02:00
stickler-ci
9e951d9a51 Fixing style errors. 2021-09-28 10:20:21 +00:00
Laurent Destailleur
0ae0d13f8b
Update mo_production.php 2021-09-28 12:20:02 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
stickler-ci
526380a4b8 Fixing style errors. 2021-09-27 08:10:49 +00:00
Stephan Steininger
c7ff60866a load existing batch numbers for item within mrp consumtion 2021-09-27 10:04:59 +02:00
Laurent Destailleur
82f66f8b0a Better label of field 2021-09-20 19:00:28 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
45c5abea69 FIX calculateCosts of BOM must not be included into fetch 2021-09-20 15:29:55 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
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
a81ee14593
Update mo_production.php 2021-09-18 16:18:09 +02:00
Laurent Destailleur
91bf2a8d77
Update mo_production.php 2021-09-18 16:16:28 +02:00
Laurent Destailleur
c37767c5a0
Update mo_production.php 2021-09-18 16:15:21 +02:00
Laurent Destailleur
e9e0258444
Update mo_production.php 2021-09-18 16:14:42 +02:00
Laurent Destailleur
b8d37ec37e
Update mo_production.php 2021-09-18 16:12:10 +02:00
mschamp
a231b44aae
Merge branch 'Dolibarr:develop' into develop 2021-09-18 12:58:02 +02:00
mschamp
018dbca5c0
Show inventory in table toConsume 
Add a column with the reel inventory to the production screen of manufacturing orders.
This gives the user an indication if production is possible.
 2021-09-18 12:51:32 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Florian HENRY
06b6ada060 fix trad 2021-09-16 17:13:03 +02:00
Florian HENRY
820a007731 NEW: add MRP into Object Linked Box 2021-09-16 17:10:06 +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
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Laurent Destailleur
b1cb32c743 Fix some sql 2021-09-15 20:03:38 +02:00
Laurent Destailleur
7deed57410 Fix scrutinizer errors 2021-09-13 01:32:20 +02:00
lmarcouiller
dea7e83360 update of mo_production.php 2021-09-09 15:33:06 +02:00
Laurent Destailleur
085b893074
Update mo_production.php 2021-09-09 14:44:52 +02:00
lmarcouiller
765f0c4d19 Close #18584 : Code enhancement of MO 2021-09-06 14:56:30 +02:00
lmarcouiller
b9150c2441 add produce line if no produce objects 2021-09-06 11:20:36 +02:00
Laurent Destailleur
2928c3dc9b NEW Add a PDF document template for Manufacturing Orders 2021-09-05 02:18:53 +02:00
Laurent Destailleur
cd313d7506 Save type (manufacture/disassemble) on MO. 2021-09-02 15:23:31 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +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
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +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
Erik van Berkum
79903470fc
Merge branch 'Dolibarr:develop' into develop 2021-08-24 22:58:03 +09:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +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
ae28dad72e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/product.php
	htdocs/product/stock/productlot_card.php
	htdocs/reception/card.php
 2021-08-17 18:07:10 +02:00
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
eba87ab295 FIX filter on status Draft in modulebuilder 2021-08-17 02:09:38 +02:00
Erik van Berkum
d249ffd5ad Fix: Change French word to English in English array. 2021-08-06 13:40:19 +09:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
2d6efd2d4c Fixing style errors. 2021-07-11 07:53:01 +00:00
fr69400
eb6284e152
Update mo_note.php 2021-07-11 09:52:46 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
f761a2d3b8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 19:02:49 +02:00
Laurent Destailleur
9fc2d9fc03 Fix phpcs 2021-07-06 19:02:03 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
5853aa4c1e Look and feel v14 2021-07-04 20:08:34 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
Laurent Destailleur
01cf608ef4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-02 16:06:48 +02:00
Christophe Battarel
3c5bc3fef4 fix division by zero on of create 2021-07-02 11:53:32 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Laurent Destailleur
594f7c8e9e Fix code for v14 2021-06-24 09:54:30 +02:00
Laurent Destailleur
e3e2dfd764 Fix generation of ODT (test if temporary directory is writable) 2021-06-20 05:11:46 +02:00
Laurent Destailleur
06b09f614a Fix var not defined 2021-06-16 12:08:34 +02:00
lmarcouiller
2688b902b6 Close #17890 : produceandconsume into api finished 2021-06-15 11:35:41 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
a88efc9065 Fix permission on produce and consume 
Missing API to produce
 2021-06-11 09:58:03 +02:00
Laurent Destailleur
e938d875fb FIX #17855 2021-06-10 18:34:43 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
UT from dolibit
50637ab76b
Update mo_agenda.php 2021-05-19 16:07:27 +02:00
Laurent Destailleur
e791f9b863 Debug MRP feature 2021-05-06 21:34:59 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
d1fb1e4fea
Merge pull request #17331 from dolibit-ut/patch-287 
Update mo_movements.php
 2021-04-19 20:20:31 +02:00
Laurent Destailleur
1adffc4b05
Update mo_movements.php 2021-04-19 20:20:23 +02:00
UT from dolibit
38d7143392
Update mo_movements.php 
$help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication';
 2021-04-19 17:46:20 +02:00
UT from dolibit
333fb2d881
Update mo_card.php 
$title = $langs->trans('Mo')." - ".$langs->trans("Card");
 2021-04-19 17:40:23 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
f99d4897a0
Merge pull request #17230 from dolibit-ut/patch-268 
Update mo_card.php
 2021-04-13 15:53:54 +02:00
Laurent Destailleur
bafdb00ea0
Update mo_agenda.php 2021-04-13 12:08:25 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
UT from dolibit
dc3574923e
Update mo_agenda.php 2021-04-12 19:24:25 +02:00
UT from dolibit
38d87494c0
Update mo_card.php 
$title = $langs->trans('Mo');

llxHeader('', $title, '');
 2021-04-12 19:02:15 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
6c84b858ee Fix #yogosha5832 2021-04-08 18:51:42 +02:00
Laurent Destailleur
a39d45e111
Merge pull request #17170 from dolibit-ut/patch-243 
Create index.html
 2021-04-08 13:32:42 +02:00
Laurent Destailleur
602d6e0265
Merge pull request #17169 from dolibit-ut/patch-242 
Create index.html
 2021-04-08 13:32:30 +02:00
Laurent Destailleur
65e1d70232
Merge pull request #17172 from dolibit-ut/patch-245 
Create index.html
 2021-04-08 13:32:18 +02:00
UT from dolibit
2fd18ca836
Create index.html 2021-04-07 19:12:04 +02:00
UT from dolibit
2d6bbf1e87
Create index.html 2021-04-07 19:10:13 +02:00
UT from dolibit
49a6654b58
Create index.html 2021-04-07 19:09:16 +02:00
UT from dolibit
2d6eb2809c
Create index.html 2021-04-07 19:08:41 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Frédéric FRANCE
434f5821f7
fix nested comments 2021-03-20 09:38:21 +01:00
Laurent Destailleur
1540f62df0 FIX #yogosha5678 2021-03-19 14:25:59 +01:00
Laurent Destailleur
d881c73e58 Fix #yogosha5664 2021-03-18 20:44:53 +01: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
stickler-ci
a9a8a177a2 Fixing style errors. 2021-03-10 09:54:43 +00:00
TuxGasy
3a3793d509 Add hidden option ALLOW_USE_KITS_INTO_BOM_AND_MO 2021-03-10 10:24:20 +01:00
Laurent Destailleur
aa06744aeb
Merge pull request #16549 from Hystepik/develop#3 
Fix #16524 : Add support disassemble BOM
 2021-03-06 11:06:54 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
stickler-ci
ebf92ba440 Fixing style errors. 2021-03-05 08:50:49 +00:00
lmarcouiller
c00d64855a Fix #16524 : Add support disassemble BOM 2021-03-05 09:47:38 +01:00
Laurent Destailleur
87c1e85017
Update mo_production.php 2021-03-04 16:10:50 +01:00
lmarcouiller
33f7f2c7d2 Fix #16525 : new button manufacturing order 2021-03-04 15:02:46 +01:00