Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
84,048 Commits 36 Branches 189 Tags
50b5226d10547030c0a2cb151935251bb6ec6937
Commit Graph

5194 Commits

Author SHA1 Message Date
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved 
FIX Permission for BOM menu
 2019-07-09 00:14:01 +02:00
Laurent Destailleur
4387d40b9a Translation lignes -> lines 2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
46f590f0be Add column iplastlogin and ippreviouslogin 2019-07-01 15:44:34 +02:00
Laurent Destailleur
c9477f5c4f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:29:33 +02:00
Laurent Destailleur
511b21ca9c Fix for doliwamp 2019-07-01 00:22:28 +02:00
Laurent Destailleur
46ced373be Fix for doliwamp 2019-06-30 23:52:28 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
John Botella
7e14a598e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-26 09:43:43 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
83f5b23ade Doc 2019-06-25 22:39:04 +02:00
Laurent Destailleur
85919d8324 Code comment 2019-06-25 22:02:19 +02:00
Laurent Destailleur
33ce52364a Drop no more used column 2019-06-25 16:08:22 +02:00
Laurent Destailleur
06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
 2019-06-25 13:03:54 +02:00
Laurent Destailleur
b8b0ad0d27 Fix migration 2019-06-25 11:22:35 +02:00
John Botella
7b6925b8f7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-24 10:29:43 +02:00
Laurent Destailleur
c1f6b76a6a Remove deprecated 2019-06-22 18:29:24 +02:00
Laurent Destailleur
db241b22dd Fix clean of database 2019-06-22 14:33:31 +02:00
Laurent Destailleur
fdff737329 Fix clean of database 2019-06-22 14:33:04 +02:00
Laurent Destailleur
c089a47b4c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 14:15:30 +02:00
Laurent Destailleur
e6ea9cc448 Clean widget not correctly removed 2019-06-22 14:15:10 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00
Laurent Destailleur
64de57d781 FIX bad request 2019-06-22 13:28:20 +02:00
Laurent Destailleur
8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/accounting.lib.php
	htdocs/product/stock/class/entrepot.class.php
 2019-06-20 18:24:43 +02:00
Laurent Destailleur
faadae8157 Code comment 2019-06-20 15:59:45 +02:00
Laurent Destailleur
06e5fbd649 Merge pull request #11132 from ptibogxiv/patch-174 
NEW add API shipment mode dictionnary
 2019-06-20 03:56:59 +02:00
Laurent Destailleur
77a45b878b Fix migration 2019-06-20 03:56:42 +02:00
Laurent Destailleur
40023c8ba2 Merge branch 'develop' into patch-174 2019-06-20 03:56:29 +02:00
Laurent Destailleur
5fe91afdc2 Update 9.0.0-10.0.0.sql 2019-06-20 03:54:50 +02:00
Laurent Destailleur
d8c2007d92 Prepare v11 alpha 2019-06-20 03:53:33 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
d152354022 Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield 
NEW add extrafields in warehouses
 2019-06-20 03:16:49 +02:00
Laurent Destailleur
b4cb440b0f Merge pull request #11359 from inoveaconseil/FIX_BOM_sql 
Fix bom sql
 2019-06-20 02:58:24 +02:00
Laurent Destailleur
13abfc3140 Code comment 2019-06-18 16:46:12 +02:00
Laurent Destailleur
1dc247705d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/holiday/list.php
 2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-18 16:04:48 +02:00
Laurent Destailleur
6afda6a47a FIX invalid link on user.fk_user 2019-06-18 15:57:22 +02:00
Laurent Destailleur
8835b49f3f Debug the accounting-file tool 2019-06-18 14:30:13 +02:00
Nicolas ZABOURI
96c6994827 FIX 2 déclarations of date_valid in SQL 2019-06-18 10:55:16 +02:00
Laurent Destailleur
4f03d4f642 Merge branch '10.0' into patch-189 2019-06-16 17:26:41 +02:00
Laurent Destailleur
badfd47ee7 Fix migration 2019-06-16 17:25:42 +02:00
ptibogxiv
d838ced12e Update 9.0.0-10.0.0.sql 2019-06-14 18:41:38 +02:00
ptibogxiv
cd5c2c3249 Update llx_bom_bom.sql 2019-06-14 18:39:05 +02:00
ptibogxiv
c6ab092af1 add capacity value for product 2019-06-14 09:12:53 +02:00
Laurent Destailleur
f41606ba15 Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
73326cfbf9 Removed bad commited files 2019-06-07 16:56:08 +02:00
Laurent Destailleur
8ef7a3abf2 Clean demofile for v10 2019-06-05 11:56:57 +02:00
Laurent Destailleur
d3d0ce4649 Better error message when missing grant privileges 2019-06-05 10:42:59 +02:00
Laurent Destailleur
a70a14b145 Fix migration 2019-06-04 20:06:44 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00