Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
105,843 Commits 36 Branches 189 Tags
87f05067ca6bf53b0bd852aeafd9437908ccc708
Commit Graph

422 Commits

Author SHA1 Message Date
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
054116900a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-13 11:59:05 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
ptibogxiv
61e6e33387 FIX bom.class.php 2022-01-11 20:37:20 +01:00
Laurent Destailleur
564bae453e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-01-10 21:00:38 +01:00
Laurent Destailleur
c334c3cd58 Update bom.class.php 2022-01-10 20:58:08 +01:00
Florian HENRY
f5c04c81a9 Merge branch 'new_refproduct_bom_tooltip' of github.com:FHenry/dolibarr into new_refproduct_bom_tooltip 2022-01-07 08:28:40 +01:00
Florian HENRY
59b1feaf2e fix include 2022-01-07 08:27:49 +01:00
stickler-ci
f71092e05c Fixing style errors. 2022-01-06 20:56:51 +00:00
Florian HENRY
a0fb0b8741 NEW: add ref product into BOM tooltips 2022-01-06 21:48:12 +01:00
Laurent Destailleur
3559515399 css 2022-01-03 19:32:21 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Christian Foellmann
819a76e16a remove some deprecated html attributes 
https://developer.mozilla.org/en-US/docs/web/html/element/td#attr-align
 2021-11-29 15:07:07 +01: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
Laurent Destailleur
5baba69970 Fix regressions 2021-10-28 15:05:50 +02:00
Laurent Destailleur
ce4fe3f400 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 18:33:47 +02:00
Laurent Destailleur
7f19682724 Merge pull request #18503 from atm-adrien/NEW_develop_sub_BOM 
NEW : Sub bill of materials
 2021-10-23 18:26:46 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Adrien Raze
2ae38ff1a9 FIX : Travis 2021-10-20 10:15:31 +02:00
Adrien Raze
a3e8d43cf5 FIX : Travis 2021-10-19 17:25:51 +02:00
stickler-ci
d3035975cf Fixing style errors. 2021-10-19 14:52:56 +00:00
Adrien Raze
48b131b3f0 FIX : Retours 2021-10-19 16:50:15 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Adrien Raze
8daa1a810a FIX : Move interface.php to ajax/ 2021-10-19 16:44:59 +02:00
Adrien Raze
b5b7281094 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_sub_BOM 2021-10-19 16:40:02 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +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
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
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
0e1cc2b096 Fix cost price is 0. 2021-09-27 18:46:27 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
c90af50585 Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-24 13:39:20 +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
1e735c48aa Code comment 2021-09-20 15:31:57 +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
ee362a42bd css 2021-09-19 21:06:09 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +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
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +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
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
fb8723d884 Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00