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 |
|
Laurent Destailleur
|
1e657b8621
|
Fix value of showoncombobox
|
2021-06-05 15:14:10 +02:00 |
|
Laurent Destailleur
|
e791f9b863
|
Debug MRP feature
|
2021-05-06 21:34:59 +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
|
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 |
|
lmarcouiller
|
33f7f2c7d2
|
Fix #16525 : new button manufacturing order
|
2021-03-04 15:02:46 +01:00 |
|
Laurent Destailleur
|
5553bae3a1
|
FIX Timezone management for datetime with modulebuilder
|
2021-03-04 09:44:01 +01:00 |
|
Frédéric FRANCE
|
d442ef48ec
|
Merge remote-tracking branch 'upstream/develop' into m_code_syntax
|
2021-02-26 18:33:21 +01:00 |
|
Frédéric FRANCE
|
f73c0abec1
|
code syntax m... directories
|
2021-02-26 18:26:44 +01:00 |
|
Francis Appels
|
3216120f44
|
MoLine origin is bomline not bom
|
2021-02-26 15:38:02 +01:00 |
|
Francis Appels
|
dae997dd4c
|
Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp
|
2021-02-02 12:18:19 +01:00 |
|
Francis Appels
|
731ca02789
|
Use new origin field to mark free lines.
Allow add free line when production started
|
2021-02-02 11:19:58 +01:00 |
|
Francis Appels
|
bf305d7083
|
create MO, Column 'tms' cannot be null
|
2021-01-30 17:28:21 +01:00 |
|
Francis Appels
|
b1cd6c5ecf
|
mo line is line so no fetchLines
|
2021-01-30 16:39:28 +01:00 |
|
Laurent Destailleur
|
2b59a20ce1
|
Merge pull request #15988 from atm-lena/13.0_FIX_Merge_Societe
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
|
2021-01-30 13:22:00 +01:00 |
|
Francis Appels
|
2436e7c5b2
|
FIX: 13 create MO, Column 'tms' cannot be null
|
2021-01-29 19:39:50 +01:00 |
|
atm-lena
|
cfca26a727
|
Fix fix
|
2021-01-29 16:20:43 +01:00 |
|
Laurent Destailleur
|
206caec290
|
Debug v13
|
2020-12-11 01:20:40 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Laurent Destailleur
|
f231620084
|
Fix creation of MRP when product is a kit.
|
2020-11-26 14:32:40 +01:00 |
|
Laurent Destailleur
|
3588781180
|
Debug v13
|
2020-11-26 14:15:20 +01:00 |
|
Laurent Destailleur
|
ed8a0093ff
|
Debug v13
|
2020-11-05 22:25:14 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00: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
|
2b09b7be8e
|
Fix css
|
2020-10-31 13:47:50 +01:00 |
|
Laurent Destailleur
|
a24071492e
|
Start fix for php8 compatibility
|
2020-10-30 05:56:07 +01:00 |
|
Laurent Destailleur
|
d2a2d74f7e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/langs/am_ET/mrp.lang
htdocs/langs/ar_SA/mrp.lang
htdocs/langs/az_AZ/mrp.lang
htdocs/langs/bg_BG/mrp.lang
htdocs/langs/bn_BD/mrp.lang
htdocs/langs/bn_IN/mrp.lang
htdocs/langs/bs_BA/mrp.lang
htdocs/langs/ca_ES/mrp.lang
htdocs/langs/cs_CZ/mrp.lang
htdocs/langs/da_DK/mrp.lang
htdocs/langs/de_DE/mrp.lang
htdocs/langs/el_GR/mrp.lang
htdocs/langs/en_US/mrp.lang
htdocs/langs/es_ES/mrp.lang
htdocs/langs/et_EE/mrp.lang
htdocs/langs/eu_ES/mrp.lang
htdocs/langs/fa_IR/mrp.lang
htdocs/langs/fi_FI/mrp.lang
htdocs/langs/fr_FR/mrp.lang
htdocs/langs/gl_ES/mrp.lang
htdocs/langs/he_IL/mrp.lang
htdocs/langs/hi_IN/mrp.lang
htdocs/langs/hr_HR/mrp.lang
htdocs/langs/hu_HU/mrp.lang
htdocs/langs/id_ID/mrp.lang
htdocs/langs/is_IS/mrp.lang
htdocs/langs/it_IT/mrp.lang
htdocs/langs/ja_JP/mrp.lang
htdocs/langs/ka_GE/mrp.lang
htdocs/langs/km_KH/mrp.lang
htdocs/langs/kn_IN/mrp.lang
htdocs/langs/ko_KR/mrp.lang
htdocs/langs/lo_LA/mrp.lang
htdocs/langs/lt_LT/mrp.lang
htdocs/langs/lv_LV/mrp.lang
htdocs/langs/mk_MK/mrp.lang
htdocs/langs/mn_MN/mrp.lang
htdocs/langs/nb_NO/mrp.lang
htdocs/langs/ne_NP/mrp.lang
htdocs/langs/nl_NL/mrp.lang
htdocs/langs/pl_PL/mrp.lang
htdocs/langs/pt_PT/mrp.lang
htdocs/langs/ro_RO/mrp.lang
htdocs/langs/ru_RU/mrp.lang
htdocs/langs/sk_SK/mrp.lang
htdocs/langs/sl_SI/mrp.lang
htdocs/langs/sq_AL/mrp.lang
htdocs/langs/sr_RS/mrp.lang
htdocs/langs/sv_SE/mrp.lang
htdocs/langs/sw_SW/mrp.lang
htdocs/langs/th_TH/mrp.lang
htdocs/langs/tr_TR/mrp.lang
htdocs/langs/uk_UA/mrp.lang
htdocs/langs/uz_UZ/mrp.lang
htdocs/langs/vi_VN/mrp.lang
htdocs/langs/zh_CN/mrp.lang
htdocs/langs/zh_HK/mrp.lang
htdocs/langs/zh_TW/mrp.lang
htdocs/mrp/class/mo.class.php
htdocs/mrp/mo_agenda.php
htdocs/mrp/mo_card.php
htdocs/mrp/mo_document.php
htdocs/mrp/mo_movements.php
htdocs/mrp/mo_note.php
htdocs/mrp/mo_production.php
|
2020-10-27 02:55:22 +01:00 |
|
Alfredo Altamirano
|
214cd2c99b
|
Update references of MO translation string
|
2020-10-26 15:44:26 -06:00 |
|
Laurent Destailleur
|
bb147d2599
|
FIX #15140
|
2020-10-25 14:12:34 +01:00 |
|
Laurent Destailleur
|
27282d7e3d
|
FIX Include the ticket and mo table in merge process of thirdparty
|
2020-10-16 17:08:23 +02:00 |
|
Laurent Destailleur
|
64b28020c8
|
Look and feel v13
|
2020-09-11 13:14:14 +02:00 |
|
Laurent Destailleur
|
7e989c8902
|
Remove TODO: Button Close possible only if production has started.
|
2020-09-11 12:36:31 +02:00 |
|
Laurent Destailleur
|
b8fe2188a6
|
Standardize code around model_pdf
|
2020-09-10 01:49:09 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
e5fc928fda
|
add new rule
|
2020-05-21 02:02:54 +02:00 |
|
Laurent Destailleur
|
e42fb1b57d
|
Fix trigger name
|
2020-05-20 23:15:56 +02:00 |
|
Laurent Destailleur
|
c4d1db263c
|
Fix end of workflow of MO
|
2020-05-20 23:15:18 +02:00 |
|
Laurent Destailleur
|
e871e736eb
|
Fix for #5824
|
2020-05-05 17:55:03 +02:00 |
|
Laurent Destailleur
|
4d6a45d491
|
Major doxygen fix
|
2020-05-03 22:48:35 +02:00 |
|
Laurent Destailleur
|
e91d263a6a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-04-22 12:57:02 +02:00 |
|
Laurent Destailleur
|
a5def19cff
|
Fix calculation from a BOM > 1
|
2020-04-22 12:56:52 +02:00 |
|
Laurent Destailleur
|
169378f276
|
Update mo.class.php
|
2020-04-22 12:34:02 +02:00 |
|
Laurent Destailleur
|
1788b1b252
|
Update mo.class.php
Use the accuracy of stock for rounding
|
2020-04-22 12:32:20 +02:00 |
|
Lenin Rivas
|
b469775718
|
More Presition to 8 decimals
|
2020-04-21 01:21:08 -05:00 |
|
Lenin Rivas
|
f3ebc33d1e
|
Fix calculator to consume with to produce
i.e. to produce 100 then Order can be produce 135.
|
2020-04-21 01:14:02 -05:00 |
|
Laurent Destailleur
|
6e71bb8707
|
Look and feel v12: Use color of status for dotnuts
|
2020-03-14 02:17:08 +01:00 |
|
Laurent Destailleur
|
6ce6dc145f
|
Use colors of status in donut
|
2020-03-12 02:20:31 +01:00 |
|
Laurent Destailleur
|
dea8525a6c
|
NEW X-Axis on graph are show vertical when there is a lot of values.
|
2020-02-29 01:26:24 +01:00 |
|
Laurent Destailleur
|
bfb9739ae8
|
Fix manufacuring efficiency on bom lines.
|
2020-02-28 16:12:42 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Laurent Destailleur
|
1f4b639ba0
|
Debug MRP module
|
2020-02-20 17:44:03 +01:00 |
|
Laurent Destailleur
|
1d760f0e42
|
Add MO in project overwiew
|
2020-02-17 21:24:59 +01:00 |
|
Laurent Destailleur
|
4762bafb02
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/mrp/class/mo.class.php
|
2020-02-12 22:58:37 +01:00 |
|
Laurent Destailleur
|
139dfc3022
|
Debug MRP module
|
2020-02-12 22:45:27 +01:00 |
|
Laurent Destailleur
|
92dc43de93
|
Fix phpcs
|
2020-02-11 19:37:24 +01:00 |
|
Laurent Destailleur
|
bf49e5cee1
|
Show tab of stock movement of MO
|
2020-02-11 17:12:22 +01:00 |
|
Laurent Destailleur
|
1875b6a49b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
|
2020-02-05 14:53:47 +01:00 |
|
Laurent Destailleur
|
c5da131749
|
Fix param not defined
|
2020-02-04 14:40:11 +01:00 |
|
Laurent Destailleur
|
bb9f4c8ec3
|
Fix var_dump
|
2020-02-04 14:34:40 +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
|
92856788a3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-20 18:39:46 +01:00 |
|
Laurent Destailleur
|
18f2b09fb1
|
Debug v11
|
2020-01-20 12:25:25 +01:00 |
|
Scrutinizer Auto-Fixer
|
8691194627
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-09 23:03:10 +00:00 |
|
Laurent Destailleur
|
f48c7d2ecf
|
Fix modulebuilder
|
2020-01-09 22:31:23 +01:00 |
|
Laurent Destailleur
|
0e58edd896
|
Fix modulebuilder
|
2020-01-09 22:27:24 +01:00 |
|
Laurent Destailleur
|
115b7f2c6b
|
Fix break on second column
|
2020-01-09 11:05:23 +01:00 |
|
Laurent Destailleur
|
60935b93c0
|
Fix break on second column
|
2020-01-09 11:04:58 +01:00 |
|
Laurent Destailleur
|
d0739af8b4
|
Debug MRP
|
2020-01-08 19:04:00 +01:00 |
|
Laurent Destailleur
|
14e92bd0be
|
css
|
2020-01-08 02:39:25 +01:00 |
|
Laurent Destailleur
|
20c9035837
|
Debug MRP
|
2020-01-07 22:17:40 +01:00 |
|
Laurent Destailleur
|
a2be1891e6
|
Finished MRP experimental module
|
2020-01-07 19:08:35 +01:00 |
|
Laurent Destailleur
|
73e62c65aa
|
Fix phpcs
|
2020-01-04 15:20:10 +01:00 |
|
Laurent Destailleur
|
15ad41ee6d
|
MRP
|
2020-01-03 15:01:14 +01:00 |
|
Laurent Destailleur
|
8059463941
|
Debug v11
|
2019-12-20 17:54:54 +01:00 |
|
Laurent Destailleur
|
58771c7d8a
|
Debug MRP v11
|
2019-12-20 17:39:42 +01:00 |
|
Laurent Destailleur
|
c0ef3b46ad
|
Work on MRP module
|
2019-12-20 15:31:05 +01:00 |
|
Laurent Destailleur
|
9f86cd8824
|
Debug v11
|
2019-12-20 11:14:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
0d56cd00ce
|
Fix property not defined
|
2019-12-12 11:42:10 +01:00 |
|
Frédéric FRANCE
|
76cf54e6e7
|
typo + doxygen
|
2019-12-09 08:07:59 +01:00 |
|
Laurent Destailleur
|
2ca5a4378b
|
Fix empty div when no address
Fix deletion of MO
|
2019-12-09 00:54:42 +01:00 |
|
Laurent Destailleur
|
9e479afff1
|
WIP Complete module MRP
|
2019-12-09 00:06:51 +01:00 |
|
Laurent Destailleur
|
2b5866aca2
|
WIP Complete module MRP
|
2019-12-08 23:45:06 +01:00 |
|
Laurent Destailleur
|
310e65b93c
|
Work on MRP cration
|
2019-12-02 15:23:21 +01:00 |
|
Laurent Destailleur
|
df03041dba
|
Fix phpcs
|
2019-11-12 09:47:39 +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 |
|
stickler-ci
|
491fe4bdff
|
Fixing style errors.
|
2019-11-10 11:09:09 +00:00 |
|
Philippe GRAND
|
18d06a1c20
|
add some comment
|
2019-11-10 12:08:41 +01:00 |
|
Laurent Destailleur
|
eb378b45a4
|
Work on BOM - MO module
|
2019-11-09 20:35:45 +01:00 |
|