Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
103,106 Commits 36 Branches 189 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

153 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
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
7deed57410 Fix scrutinizer errors 2021-09-13 01:32:20 +02:00
lmarcouiller
765f0c4d19 Close #18584 : Code enhancement of MO 2021-09-06 14:56:30 +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
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
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
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
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
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
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
a88efc9065 Fix permission on produce and consume 
Missing API to produce
 2021-06-11 09:58:03 +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
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
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
UT from dolibit
49a6654b58 Create index.html 2021-04-07 19:09:16 +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