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

1364 Commits

Author SHA1 Message Date
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Laurent Destailleur
b085ce6916 Fix lost translation keys 2016-07-23 13:01:42 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
2c77a901b3 Fix to avoid removal of trnaslation key to keep 2016-07-18 12:55:44 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
 2016-07-16 19:54:57 +02:00
Juanjo Menent
cd0849209c FIX Failed to open file 2016-07-15 19:44:45 +02:00
Juanjo Menent
88d12618ce NEW Do not use Functions Aliases 2016-07-15 17:10:13 +02:00
Juanjo Menent
8a022fb19d NEW Do not use Function Aliases 2016-07-15 16:58:26 +02:00
Laurent Destailleur
24a798ed2f Fix restore translation for ModuleCompanyCode... 2016-07-07 14:13:33 +02:00
florian HENRY
1bb28648c4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	build/pad/DoliWamp.pml
	build/pad/Dolibarr.pml
	build/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
 2016-07-07 09:05:13 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
ce3f45c2a2 Debug of doliwamp for 4.0 2016-07-03 13:14:33 +02:00
Laurent Destailleur
3611161b67 Fix custom code should not appears on services 2016-06-30 19:35:11 +02:00
Laurent Destailleur
bc38bc63ca Fix minor bug in direct printing with google cloud print 2016-06-26 21:18:44 +02:00
Laurent Destailleur
9ebf7a1e35 Try to fix the group_concat function for pgsql. 2016-06-25 02:21:54 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several 
tabs are opened on form to send emails.
 2016-06-24 16:10:52 +02:00
Laurent Destailleur
7fbbf7e8f0 Fix translation missing 2016-06-22 20:09:20 +02:00
Laurent Destailleur
b01eed697e Fix sort on thirdparty on bank transaction list 2016-06-20 11:30:43 +02:00
Laurent Destailleur
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
Laurent Destailleur
f817b562ad Clean language files 2016-06-18 17:17:45 +02:00
Laurent Destailleur
94b7e176a6 Clean language files 2016-06-18 16:46:21 +02:00
Laurent Destailleur
de76f2a9aa Clean language files 2016-06-18 15:50:37 +02:00
Laurent Destailleur
d192438eae Enhance tool to clean language files 2016-06-18 12:50:15 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
404847ed32 Fix sql files not included into the fixdosfiles.sh 2016-06-07 11:10:09 +02:00
Laurent Destailleur
e6196f69cd Fix Restler bug returning warnings 2016-05-18 00:45:13 +02:00
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby 
dates.
 2016-05-17 18:19:36 +02:00
Laurent Destailleur
3b99fb01ee Fix duplicate table 2016-05-17 10:51:03 +02:00
Laurent Destailleur
f9ded46a99 Start debug 4.0 2016-05-17 02:41:06 +02:00
Laurent Destailleur
986119d2b5 Start debug 2016-05-12 21:32:24 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture 
change before the freeze)
 2016-04-23 15:37:22 +02:00
Laurent Destailleur
c939273fd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 13:38:56 +02:00
Laurent Destailleur
d735f5dc70 FIX lost css change 2016-04-22 11:10:20 +02:00
Laurent Destailleur
c2de7adb32 Minor PHPCS fixes 2016-04-21 03:18:42 +02:00
Laurent Destailleur
4619040983 Work on website module 2016-04-19 18:41:05 +02:00
Laurent Destailleur
e47c9946b2 More complete cleaning tools 2016-04-08 15:09:31 +02:00
Laurent Destailleur
8222624ff0 NEW Can select fields to show on list also for list of customer orders, 
shipments and invoices.
 2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0 Work on select fields for orders, invoices and shipments 2016-04-08 01:00:02 +02:00
Laurent Destailleur
43165bab02 FIX Filter/search on extrafields on lists 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-04 16:22:26 +02:00
Laurent Destailleur
592a041bc5 FIX Filter/search on extrafields on lists 2016-04-04 16:02:29 +02:00
Laurent Destailleur
482581bb84 Update module descriptor example with new fields 2016-04-01 14:52:38 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e Revert change that break compatiblity with 100% of modules 2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3 NEW Converted Form::showLinkedObjectBlock to a static function 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00