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

9416 Commits

Author SHA1 Message Date
Laurent Destailleur
2af23aa658 Enhance modulebuilder 2019-11-01 17:54:17 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11 
Enhance the progress bar of tasks
 2019-11-01 15:53:57 +01:00
Laurent Destailleur
fb95d14aeb Work on MO 2019-10-31 23:02:51 +01:00
Laurent Destailleur
716c2bb531 Work on MO 2019-10-31 22:46:34 +01:00
Laurent Destailleur
f98df3c807 NEW Can edit link to the translation page in website module 2019-10-31 21:09:33 +01:00
Frédéric FRANCE
f7747ed00a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
John Botella
f626f249cf Fix missing lang 2019-10-30 15:40:06 +01:00
Laurent Destailleur
6a01132fdb Merge pull request #12210 from grandoc/new_branch_24_10_2019 
add some comment
 2019-10-30 03:17:21 +01:00
Laurent Destailleur
beb85ee3a8 Work on MO 2019-10-30 00:56:57 +01:00
Laurent Destailleur
66337ec234 NEW Add widgets for BOMs and MOs 2019-10-30 00:36:47 +01:00
Frédéric FRANCE
30d416f8c0 Update agenda.lang 2019-10-28 20:16:27 +01:00
Frédéric FRANCE
1ba9612f12 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-27 17:03:50 +01:00
Laurent Destailleur
7f1b67f0e4 Add warehouse for production on MO 2019-10-27 16:28:03 +01:00
Laurent Destailleur
afa3ed499f Can export BOMs 2019-10-27 15:56:20 +01:00
Laurent Destailleur
eb112d4012 Add qty frozen and disable stock change flag on BOM 2019-10-27 01:49:31 +02:00
Laurent Destailleur
f060ef1018 FIX Clean decimal data for module builder 2019-10-27 00:01:16 +02:00
Frédéric FRANCE
a43e6f96b5 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Philippe GRAND
dde9dcbee3 missing translation 2019-10-24 16:29:27 +02:00
Laurent Destailleur
88e848e346 FIX Extrafields missing in export of expense report 2019-10-24 16:00:10 +02:00
Laurent Destailleur
15609e319f FIX Extrafields missing in export of expense report 2019-10-24 15:57:34 +02:00
Laurent Destailleur
64ac113761 Show dictionaries of a module in module builder 2019-10-24 14:56:43 +02:00
Laurent Destailleur
2201b11fd3 NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL 
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
 2019-10-24 13:41:04 +02:00
Laurent Destailleur
6fa3b53cf7 NEW Module builder can generate CSS of JS file. 2019-10-24 11:41:36 +02:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2019-10-23 04:04:32 +02:00
Laurent Destailleur
f23804a091 FIX #12152 2019-10-23 03:00:19 +02:00
Laurent Destailleur
0180014d4d Fix link in popup of shipment 2019-10-23 01:35:32 +02:00
Laurent Destailleur
fea12076ee FIX #12152 2019-10-22 20:24:52 +02:00
Laurent Destailleur
6079a4d159 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/main.lang
 2019-10-22 15:25:31 +02:00
Tim Otte
ceb3482204 Requested changes implemented 2019-10-22 11:36:28 +02:00
Laurent Destailleur
c5490e22d1 Fiw trans 2019-10-22 02:58:55 +02:00
Laurent Destailleur
8e474701c1 Fix missing token 2019-10-21 15:49:08 +02:00
Laurent Destailleur
b21bca17de Add button Save and stay when editing property of web site 2019-10-21 00:55:52 +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
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Laurent Destailleur
bf1b2242ea Fix no focus if we are on edit mode directly 2019-10-20 13:22:29 +02:00
Frédéric FRANCE
f9c0e63f16 Update main.lang 2019-10-17 22:59:52 +02:00
Frédéric FRANCE
aeafdae34c Update main.lang 2019-10-17 22:58:47 +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
87ec1de78e Start to work on solution to sort permissions by module 2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e Merge branch 'develop' into 10.0_closure2 2019-10-17 18:16:57 +02:00
Laurent Destailleur
1a419a6eb6 Fix translation 2019-10-17 15:15:16 +02:00
Laurent Destailleur
084ab53b4b Fix translation 2019-10-17 12:14:38 +02:00
Gildas
7ccc07c05f Fix translation typo in stocks 2019-10-17 12:11:01 +02:00
Laurent Destailleur
7d965e8b92 Merge pull request #12139 from frederic34/patch-17 
translation for ORDER_SUPPLIER_DELETEInDolibarr
 2019-10-16 13:22:46 +02:00
Laurent Destailleur
ffc4820970 Fix counter of BOM 2019-10-16 02:05:23 +02:00
Laurent Destailleur
b0355dd149 Module BOM have now status DRAFT, VALIDATED, DISABLED 2019-10-16 01:20:58 +02:00
Laurent Destailleur
12f1962085 Better error message when module file is corrupted 2019-10-16 00:40:42 +02:00
Frédéric FRANCE
d1d9b1ed85 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Frédéric FRANCE
00bac9e989 Update interface_50_modAgenda_ActionsAuto.class.php 
Update agenda.lang

Update agenda.lang

Update interface_50_modAgenda_ActionsAuto.class.php
 2019-10-15 09:38:24 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00