lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,393 Commits 43 Branches 150 Tags 886 MiB
6da82762f2
Commit Graph

56393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
9cc7b53071 Merge remote-tracking branch 'Upstream/develop' into 4.0-p13 2016-04-03 10:50:33 +02:00
aspangaro
33e8833287 Fix travis 2016-04-03 10:47:21 +02:00
Laurent Destailleur
6096c8c49a Minor fix in CSS 2016-04-02 16:53:55 +02:00
Laurent Destailleur
e954fc07b3 Use natural_search for sql search forging 2016-04-02 16:30:17 +02:00
Laurent Destailleur
127ceeac8c Uniformize code for list of audit events 2016-04-02 16:12:48 +02:00
Laurent Destailleur
10f639507f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:54:51 +02:00
Laurent Destailleur
066c793de2 FIX image extension must be in lower case 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:46:01 +02:00
Laurent Destailleur
c12541f4f2 FIX image extension must be in lower case 2016-04-02 15:00:58 +02:00
Laurent Destailleur
c0b2d7405a FIX Generated thumbs must always use the png format so using thumbs can 
work.
 2016-04-02 14:46:04 +02:00
Laurent Destailleur
599b225489 FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:21:50 +02:00
Laurent Destailleur
be8384389f FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:20:21 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
66f9f0d046 FIX Creation of thumb image for size "small" was not done. 2016-04-02 14:15:38 +02:00
aspangaro
0c5f504881 FIX: Accountancy - Correct the display of account_parent 2016-04-02 06:22:31 +02:00
Laurent Destailleur
281b06a2d3 NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and 
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
 2016-04-01 18:44:23 +02:00
Frédéric FRANCE
d4529d19c7 Update facture.php 
ref_client in order
ref_customer in shipping
 2016-04-01 17:32:58 +02:00
Florian HENRY
038b928ea4 fix travis 2016-04-01 17:09:03 +02:00
Laurent Destailleur
7edd1d89a0 Fix missing td 2016-04-01 16:59:17 +02:00
Laurent Destailleur
d14f3d7e2b FIX When deleting last shipment, status "shipment in progress" of order 
must move back to status "validated".
 2016-04-01 16:59:08 +02:00
Laurent Destailleur
e40b678d7b Uniformize code 2016-04-01 16:29:47 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
Laurent Destailleur
482581bb84 Update module descriptor example with new fields 2016-04-01 14:52:38 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Florian HENRY
867dbc766e Merge branch 'develop' into develop_advtargetemailiing 2016-04-01 14:03:43 +02:00
Florian HENRY
081c7824d2 FIX : range is MySQL reserved word, cannot be used as column names 2016-04-01 14:00:14 +02:00
Laurent Destailleur
9c394b58b5 Move help text at better place. 2016-04-01 12:40:34 +02:00
Laurent Destailleur
be483bd787 FIX Some records were lost into margin per product report 2016-04-01 12:28:15 +02:00
Laurent Destailleur
8a1358d539 FIX Some records were lost into margin per product report 2016-04-01 12:27:49 +02:00
Laurent Destailleur
27ed9ba3da Remove now link useless here 2016-04-01 12:13:43 +02:00
Laurent Destailleur
feb35adbe1 FIX Missing clean of criteria 2016-04-01 12:04:07 +02:00
Laurent Destailleur
063905ea03 Save space again (another line won) 2016-04-01 11:43:11 +02:00
Laurent Destailleur
9eb1925825 FIX No need to ask doc template when only one is defined 2016-04-01 11:12:49 +02:00
Laurent Destailleur
c340745b78 FIX Option "showstock" was not effective into warehouse list 2016-04-01 11:05:15 +02:00
Laurent Destailleur
0981039573 FIX If stock module not enabled, it was not possible to make shipments 2016-04-01 10:57:18 +02:00
Florian HENRY
304aab957b Start implement advance arget emalaing 2016-04-01 10:52:19 +02:00
aspangaro
1df1e775ee Space2 2016-04-01 06:49:24 +02:00
aspangaro
e118aad95f Space 2016-04-01 06:48:17 +02:00
aspangaro
620e03337a Merging problem 2016-04-01 06:45:46 +02:00
aspangaro
84d326e036 FIX: Problem with dolibarr installation/migration script. Range is a reserved name. 2016-04-01 06:41:49 +02:00
Laurent Destailleur
2a19326a3f FIX Missing database escaping on supplier price insert/update 2016-03-31 21:47:32 +02:00
Frédéric FRANCE
90e74b346e Update llx_propal_merge_pdf_product.sql 
No need IF NOT EXISTS at install time
 2016-03-31 17:13:38 +02:00
Frédéric FRANCE
125256c825 Update llx_usergroup_extrafields.sql 
No need IF NOT EXISTS at install time
 2016-03-31 17:11:17 +02:00
Frédéric FRANCE
1419b0e385 Update llx_establishment.sql 2016-03-31 17:06:10 +02:00
Laurent Destailleur
fea9c65906 FIX Missing clean of criteria 2016-03-31 15:22:43 +02:00
root
b018500fd4 FIX multicompany project access 2016-03-31 14:44:18 +02:00
Florian HENRY
f567a2a0ce Search box hook 2016-03-31 12:50:40 +02:00
Laurent Destailleur
9459a36c12 Minor look enhancement 2016-03-31 12:28:45 +02:00
Florian HENRY
5d4c959d2e Add hook parameters on New search Box 2016-03-31 12:18:26 +02:00
Laurent Destailleur
54f3005666 NEW Can select fields to show on proposal lists. 2016-03-31 11:58:05 +02:00
Laurent Destailleur
ed867deb80 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-30 23:35:55 +02:00