Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
56,167 Commits 36 Branches 189 Tags
024c0501bf64b41b63ac7580fddd129b26ec657e
Commit Graph

56167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
024c0501bf Merge pull request #5885 from GPCsolutions/develop-members-types 
Add deprecated property explicitly
 2016-10-24 00:59:39 +02:00
Laurent Destailleur
6b67e69412 git push origin developMerge branch 'atm-gauthier-NEW_parent_warehouse' into develop 2016-10-24 00:58:12 +02:00
Laurent Destailleur
3c3c5d06a1 Merge branch 'NEW_parent_warehouse' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 00:58:02 +02:00
Laurent Destailleur
8e8506968f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-24 00:45:09 +02:00
Laurent Destailleur
ca62afb489 git push origin developMerge branch 'atm-gauthier-NEW_customerorders_to_bill' into develop 2016-10-24 00:44:47 +02:00
Laurent Destailleur
0b63f89e3a Merge branch 'NEW_customerorders_to_bill' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_customerorders_to_bill

Conflicts:
	htdocs/langs/en_US/bills.lang
 2016-10-24 00:44:37 +02:00
Laurent Destailleur
e388feee07 Merge pull request #5771 from defrance/patch-28 
Add update_total function (like on other element)
 2016-10-24 00:41:27 +02:00
Laurent Destailleur
468ff6795a Merge pull request #5827 from aspangaro/5.0-p20 
Work on supplier type (Replacement / deposit / credit note) invoice
 2016-10-24 00:38:32 +02:00
Laurent Destailleur
ab3cdfa16d Clean code 2016-10-24 00:33:39 +02:00
Laurent Destailleur
60ba6164e4 Merge pull request #5883 from aspangaro/5.0-p22 
Accountancy - Add loan module in step to configure the accountancy
 2016-10-24 00:17:09 +02:00
Laurent Destailleur
399d691340 Merge pull request #5909 from aspangaro/5.0-p27 
Better presentation for user edit card
 2016-10-24 00:10:31 +02:00
Laurent Destailleur
edd8b8ce92 FIX Sort list of file on ecm module 2016-10-23 23:44:03 +02:00
Laurent Destailleur
939afa9569 NEW Can make reconcile directly from bank entry list 2016-10-23 23:24:55 +02:00
Laurent Destailleur
534202ad45 NEW Can make reconcile directly from bank entry list 2016-10-23 23:13:03 +02:00
Laurent Destailleur
b8c9e95281 Fix translation 2016-10-22 19:14:31 +02:00
Laurent Destailleur
9ab8f76777 Fix insert supplier invoice line 2016-10-22 18:40:21 +02:00
Laurent Destailleur
8fa44e9363 Fix balance calculation 2016-10-22 17:56:12 +02:00
Laurent Destailleur
35601775e0 By default we open a new tab on external url link 2016-10-22 17:05:47 +02:00
Laurent Destailleur
abc471575a Fix sql error 2016-10-22 17:00:19 +02:00
Laurent Destailleur
11609eab71 Update doc 2016-10-22 15:03:13 +02:00
Laurent Destailleur
dd9095531a Fix for debian package 2016-10-22 15:03:00 +02:00
Laurent Destailleur
6965e987f0 Keep fpdi embedded 2016-10-22 14:35:45 +02:00
Laurent Destailleur
d002648733 Alignement 2016-10-22 14:25:56 +02:00
Laurent Destailleur
14c26bafbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-22 14:23:42 +02:00
Laurent Destailleur
a057cb93c9 Debug accounting module 2016-10-22 14:23:33 +02:00
Laurent Destailleur
4eeae6e054 Debug accounting module 2016-10-22 14:05:04 +02:00
Laurent Destailleur
14c9cd4490 Fix help with new menu 2016-10-22 13:57:47 +02:00
Laurent Destailleur
14e78ef50b Mutualize code of 2 lists into one page. 2016-10-22 13:52:43 +02:00
aspangaro
06c70e5a15 Better presentation for user edit card 2016-10-22 06:42:45 +02:00
Laurent Destailleur
3219c07adc FIX Avoid error if no data 2016-10-21 18:45:44 +02:00
Laurent Destailleur
50a5fe6fd9 Work on accounting module 2016-10-21 18:24:46 +02:00
Laurent Destailleur
f0365e49e2 Fix book keeper can edit accounting account of taxes 2016-10-21 18:05:26 +02:00
Laurent Destailleur
9eafff4a97 Debug module accounting 2016-10-21 17:41:05 +02:00
Laurent Destailleur
47d4b184cd FIX Size of top menu image when menu is not allowed 2016-10-21 17:24:22 +02:00
Laurent Destailleur
f93bca9be9 NEW Can see/make bank conciliation from transaction list 2016-10-21 17:00:31 +02:00
Laurent Destailleur
304a44ffc2 Debug accounting module 2016-10-21 14:48:55 +02:00
Laurent Destailleur
16a3ba148a Fix edit of vat 2016-10-21 14:47:29 +02:00
Laurent Destailleur
d18097da28 Prepare database to manage different vat rate with same rate value. 2016-10-21 14:09:11 +02:00
Laurent Destailleur
3111b56b20 Fix navigation for list of product to bound. 2016-10-21 12:45:19 +02:00
Laurent Destailleur
c4dd689b08 Clean unreachable code 2016-10-21 11:53:41 +02:00
Laurent Destailleur
cef43bf4b6 Better support of multicompany 2016-10-21 11:10:11 +02:00
Laurent Destailleur
618ac420e4 Better skeleton 2016-10-21 10:56:25 +02:00
gauthier
59941f9980 FIX : must not get full path with recursive query 2016-10-20 14:29:51 +02:00
gauthier
9a3d4031c5 FIX : param $protection - Deep counter to avoid infinite loop 2016-10-20 13:30:47 +02:00
gauthier
d85dd69184 NEW : get_full_arbo() & get_children_warehouses() functions documentation 2016-10-20 13:14:28 +02:00
Laurent Destailleur
19532c9965 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2016-10-18 13:00:46 +02:00
Laurent Destailleur
24ee2bce14 FIX Can edit the customer ref even if order is not draft. 2016-10-18 12:57:30 +02:00
Laurent Destailleur
bb6177e72f Better text 2016-10-18 12:44:27 +02:00
Laurent Destailleur
dada679110 Uniformise code 2016-10-18 12:16:12 +02:00
Laurent Destailleur
0f88bdd971 NEW Can filter on project ref on the "new time consumed" page. 2016-10-18 12:15:59 +02:00