lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53,640 Commits 43 Branches 150 Tags 886 MiB
fd6dbf5d1a
Commit Graph

53640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
fd6dbf5d1a Fix Remove unused variables 2016-05-06 22:59:03 +02:00
Juanjo Menent
5f28070417 Fix Remove unused variables 2016-05-06 22:43:50 +02:00
Juanjo Menent
9e7e23a8ab Fix Remove unused variables 2016-05-06 22:30:34 +02:00
Juanjo Menent
f73c8310fb Merge remote-tracking branch 'upstream/develop' into develop 2016-05-06 22:13:03 +02:00
Juanjo Menent
47103fdac7 Fix Remove unused variables 2016-05-06 22:11:05 +02:00
Laurent Destailleur
d484383467 Minor errors 2016-05-06 22:06:23 +02:00
Laurent Destailleur
bf09e4a0b9 PHPdoc 2016-05-06 21:28:06 +02:00
Laurent Destailleur
91d300289f Minor fix in presentation 2016-05-06 12:15:44 +02:00
Laurent Destailleur
a05963ee2b Better position for clear button 2016-05-06 11:22:58 +02:00
Laurent Destailleur
5a75f346ff Debug advanced selector 2016-05-06 00:02:22 +02:00
Laurent Destailleur
cdbbe8d87b Minor fixes 2016-05-05 23:44:44 +02:00
Laurent Destailleur
f78bc16076 FIX Option 'onlypicto' was showing also the ref 2016-05-05 23:39:58 +02:00
Laurent Destailleur
2960fb6df7 FIX Option not tested everywhere 2016-05-05 23:28:22 +02:00
Laurent Destailleur
69f40c26ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-05 23:19:32 +02:00
Laurent Destailleur
06d0c261ad Add TODO comment 2016-05-05 23:19:21 +02:00
Laurent Destailleur
aa55cdadac Merge pull request #4944 from FHenry/develop_advtargetemailiing 
NEW : Advance target emailing
 2016-05-05 23:18:27 +02:00
Laurent Destailleur
12cc1ad326 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-05 23:05:31 +02:00
Laurent Destailleur
0c6aaaaa3c FIX #5168 2016-05-05 23:05:17 +02:00
Laurent Destailleur
31ef42c559 Merge pull request #5167 from frederic34/patch-10 
Add "no order"
 2016-05-05 23:01:16 +02:00
Laurent Destailleur
8bc0ef3afe Merge pull request #5166 from frederic34/patch-9 
put colspan in td instead tr
 2016-05-05 22:56:17 +02:00
Laurent Destailleur
3eabcccdd9 Merge pull request #5165 from frederic34/patch-8 
put colspan in td instead tr
 2016-05-05 22:55:53 +02:00
Laurent Destailleur
7b5262cf92 Merge pull request #5159 from atm-alexis/develop_FIX_hook_expedition 
NEW hook addMoreActionsButtons in shipment card
 2016-05-05 22:54:24 +02:00
Laurent Destailleur
816dda5a8b Merge pull request #5158 from aspangaro/4.0-p29 
FIX: Accountancy - Little fix et add page to assign massively the category
 2016-05-05 22:52:20 +02:00
Laurent Destailleur
ed3e15b39e Merge pull request #5150 from fmarcet/peru 
New: Add Perú regions
 2016-05-05 22:48:02 +02:00
Laurent Destailleur
ec34b26562 Merge pull request #5148 from aspangaro/4.0-p27 
FIX: Fiscal year - Some mistakes on card
 2016-05-05 22:46:48 +02:00
Laurent Destailleur
1f23909899 Merge pull request #5146 from aspangaro/4.0-p26 
NEW: Accountancy - Prepare multiple journals
 2016-05-05 22:46:36 +02:00
Laurent Destailleur
a41403c594 Merge pull request #5144 from frederic34/patch-7 
select engine for code 128 didn't work
 2016-05-05 22:32:20 +02:00
Laurent Destailleur
db5cd36634 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-05 22:30:31 +02:00
Laurent Destailleur
8065e00795 FIX #5142 2016-05-05 22:30:08 +02:00
Laurent Destailleur
7e34581952 Merge pull request #5139 from aspangaro/4.0-p25 
FIX: Accountancy - Chart of accounts are limited on only one country
 2016-05-05 22:27:05 +02:00
Laurent Destailleur
ca37a90a1b Better explanation 2016-05-05 22:26:42 +02:00
Laurent Destailleur
d2df537d43 Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project 
NEW allow a document to be linked to project from another customer
 2016-05-05 22:24:32 +02:00
Laurent Destailleur
f901453a6b FIX addMoreActionsButtons hook must be inside the div class=tabaction. 2016-05-05 21:38:29 +02:00
Laurent Destailleur
92f9919f97 Merge pull request #5116 from defrance/patch-3 
Add addMoreActionsButtons Hook (standardisation)
 2016-05-05 21:31:02 +02:00
Laurent Destailleur
10c7b167ea Merge pull request #5115 from fappels/develop-new-warehouse-only-internal-status 
NEW prepare for additional warehouse statuses
 2016-05-05 21:27:47 +02:00
Laurent Destailleur
9c00c7ff97 Merge pull request #5105 from atm-alexis/develop_NEW_details_per_warehouse_into_reassort 
NEW show detail per warehouse into reassort
 2016-05-05 21:11:10 +02:00
Laurent Destailleur
d50e9cde34 Merge pull request #5090 from atm-maxime/fix_pdffoot_details 
PDF foot details
 2016-05-05 21:09:46 +02:00
Laurent Destailleur
c795803da1 FIX ref_supplier was not set. We also refered to old var names. 2016-05-05 20:19:56 +02:00
Laurent Destailleur
8a8e7cdf5e Merge pull request #4686 from bafbes/abb-10 
New + Fix : handle supplier orders from customer orders with id variable name correction
 2016-05-05 20:07:42 +02:00
Laurent Destailleur
461f62c200 Use the new global search form 2016-05-05 13:29:42 +02:00
Laurent Destailleur
f7bd2d16db Prepare upgrade of doliwamp 2016-05-04 20:48:49 +02:00
Laurent Destailleur
1af8ca458d Better image 
Conflicts:
	build/exe/doliwamp/doliwamp.bmp
 2016-05-04 20:34:25 +02:00
Laurent Destailleur
8b41970b2e Prepare upgrade of doliwamp 2016-05-04 20:19:53 +02:00
Frédéric FRANCE
5c81feab7e Add "no order" 2016-05-04 17:10:12 +02:00
Frédéric FRANCE
72695d1dee put colspan in td instead tr 2016-05-04 17:02:58 +02:00
Frédéric FRANCE
2f3a2303d4 put colspan in td instead tr 2016-05-04 16:49:15 +02:00
Laurent Destailleur
b4e5acbaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2016-05-04 14:43:40 +02:00
Laurent Destailleur
568a43214d Add code comment 2016-05-04 13:51:47 +02:00
Laurent Destailleur
cbbafb6432 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-04 13:50:17 +02:00
Laurent Destailleur
911e862a8e Fix missing translation and add a TODO to avoid infinite loop. 2016-05-04 13:49:05 +02:00