Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

5156 Commits

Author SHA1 Message Date
Laurent Destailleur
eb112d4012 Add qty frozen and disable stock change flag on BOM 2019-10-27 01:49:31 +02:00
Laurent Destailleur
8a22dcdbcb Add sql for MO 2019-10-26 22:49:16 +02:00
wdammak
1a133bffa2 Remove limit time for upgrade 
remove set_time_limit
 2019-10-26 19:54:02 +02:00
Frédéric FRANCE
a43e6f96b5 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Laurent Destailleur
1cd1152290 Merge pull request #12193 from dolibarr95/patch-56 
NEW: package sql data
 2019-10-22 19:25:32 +02:00
dolibarr95
af8f5948f0 Package tables 
llx_expedition_package and llx_c_shipment_package_type
 2019-10-22 13:54:50 +02:00
ptibogxiv
c3fac0b8c9 Update llx_adherent_type.sql 2019-10-22 12:52:41 +02:00
ptibogxiv
d77215c40e Update llx_adherent_type.sql 2019-10-22 12:52:14 +02:00
Laurent Destailleur
8aacfcdfbd Merge branch 'develop' into patch-234 2019-10-22 12:46:39 +02:00
Laurent Destailleur
1ba9c31b37 Add migration of index 2019-10-22 12:34:03 +02:00
Laurent Léonard
b5aab50194 Add index on fk_origin_line column of llx_expeditiondet table 2019-10-22 06:07:11 +02:00
dolibarr95
c235740544 parcel to package 2019-10-21 08:58:13 +02:00
dolibarr95
16bd837dc7 create file 
Dictionary of package type
 2019-10-21 08:54:59 +02:00
dolibarr95
6a55aedf59 Create file. 
List of parcels details related to an expedition.
 2019-10-21 08:46:07 +02:00
Frédéric FRANCE
9ec7836387 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Frédéric FRANCE
f4540dddb8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
2d017a6c80 Fix migration 2019-10-17 20:09:24 +02:00
Laurent Destailleur
005b1b12c4 Work on sort of permission per family+module 2019-10-17 19:33:06 +02:00
Laurent Destailleur
87ec1de78e Start to work on solution to sort permissions by module 2019-10-17 18:43:07 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
e94d47daf7 Work on MRP module 2019-10-15 19:57:23 +02:00
Frédéric FRANCE
2351750d2b Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-14 19:02:46 +02:00
Laurent Destailleur
7973b03201 NEW Add estimated duration on the BOM module 2019-10-14 11:38:36 +02:00
Frédéric FRANCE
d9ba09bec1 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Laurent Destailleur
dfaf2ae34b Trans 2019-10-11 19:20:52 +02:00
Frédéric FRANCE
367ef4acaf Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
de107fb02e NEW Can set a squarred icon on your company setup 2019-10-11 11:27:05 +02:00
Frédéric FRANCE
03bbfc6ad9 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-10 23:24:50 +02:00
Laurent Destailleur
28b87f9e27 Add image for members 2019-10-10 10:35:18 +02:00
Frédéric FRANCE
02b706f9c0 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-09 13:40:46 +02:00
Laurent Destailleur
29384d9a71 Merge branch 'develop' into patch-187 2019-10-09 13:02:47 +02:00
Laurent Destailleur
a8fbefed8c Update 10.0.0-11.0.0.sql 2019-10-08 19:42:40 +02:00
Laurent Destailleur
dcc4fa6a64 Merge branch 'develop' into patch-255 2019-10-08 19:37:42 +02:00
Frédéric FRANCE
f253315c8d Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
ptibogxiv
17198d59c2 Update 10.0.0-11.0.0.sql 2019-10-08 16:17:31 +02:00
ptibogxiv
552a9498be Update llx_product.sql 2019-10-08 16:11:50 +02:00
Laurent Destailleur
d55b7689bb Merge pull request #11920 from ptibogxiv/patch-264 
NEW translation for member type
 2019-10-08 09:00:49 +02:00
Frédéric FRANCE
b78187c1eb Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
c6c498fd67 Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
e02794248e Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Frédéric FRANCE
f80fa08a2d Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-07 07:57:05 +02:00
Laurent Destailleur
d4bb6490e9 Fix migration 2019-10-06 16:25:22 +02:00
Frédéric FRANCE
6384e7eb67 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Frédéric FRANCE
0383fdbeee Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 18:37:14 +02:00
Frédéric FRANCE
91761e8185 fix migration script for thirdparties 2019-10-02 21:16:33 +02:00
Frédéric FRANCE
fe4629cd87 new migration script for thirdparties 2019-10-02 21:11:21 +02:00
Frédéric FRANCE
634fc5727c new migration script for contacts 2019-10-02 21:08:41 +02:00