lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,889 Commits 43 Branches 150 Tags 886 MiB
1652f80300
Commit Graph

47889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1652f80300 Memory optimizing. Save 2.3 Mb of memory for all forms that can show 
margin informations. Save 300 Kb of memory for all other pages.
 2015-06-06 15:19:25 +02:00
Laurent Destailleur
8d84dd1155 Uniformize code 2015-06-06 14:34:57 +02:00
Laurent Destailleur
89f77f5e2b Uniformize code 2015-06-06 14:21:18 +02:00
Laurent Destailleur
1880ed701f Uniformize code 2015-06-06 13:22:15 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
Laurent Destailleur
fad44a068d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-06 11:48:28 +02:00
Laurent Destailleur
1df1a0cd2a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-06 00:14:28 +02:00
Laurent Destailleur
13001a5e9c Fix #2909 2015-06-06 00:13:58 +02:00
Laurent Destailleur
6331290056 Fix phpcs 2015-06-05 20:23:04 +02:00
Laurent Destailleur
4bac36d810 Merge pull request #2972 from FHenry/develop 
fix bug in upgare2.php script (test $res after affect it should be better)
 2015-06-05 19:06:41 +02:00
Laurent Destailleur
50fba5c506 Merge pull request #2970 from GPCsolutions/dolibarr-2969 
Add missing ; to database password encryption instructions
 2015-06-05 19:04:47 +02:00
Laurent Destailleur
b7cf070d2d Fix phpcs 2015-06-05 18:43:14 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Laurent Destailleur
91f4fccb21 Remove warning 2015-06-05 18:26:12 +02:00
Florian HENRY
98c5a75a7e fix bug in upgare2.php script (test $res after affect it should be 
better)
 2015-06-05 17:51:20 +02:00
Raphaël Doursenaud
7808c5a5ad Add missing ; to database password encryption instructions 
Fix #2969
 2015-06-05 17:14:53 +02:00
Laurent Destailleur
1252a500ce Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
 2015-06-05 16:50:46 +02:00
Laurent Destailleur
77dafcbc3b Merge pull request #2945 from GPCsolutions/skeleton 
Qual: PHP5 OOP, commented and typehinted class template
 2015-06-05 16:15:03 +02:00
Laurent Destailleur
30f6cd08cf Merge pull request #2943 from aspangaro/develop-donation2 
New: Add object ot the company & Add picture cerfa logo
 2015-06-05 15:58:47 +02:00
Laurent Destailleur
7e3a457f85 Merge pull request #2942 from aspangaro/develop-donation 
Fix: Donation error on admin tab & Fix: Input disabled by default
 2015-06-05 15:57:35 +02:00
Laurent Destailleur
51d275ee77 Merge pull request #2941 from atm-gauthier/3.7 
FIX : When we clone a propal, if it has a project which is not assign…
 2015-06-05 15:56:36 +02:00
Laurent Destailleur
eebb93f435 Merge pull request #2940 from GPCsolutions/restapireview 
Fixed some coding style issues
 2015-06-05 15:55:15 +02:00
Laurent Destailleur
115dd4374e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-05 15:52:40 +02:00
Laurent Destailleur
c4dd060858 Disable PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore 
rule
 2015-06-05 15:52:18 +02:00
Laurent Destailleur
689d3e39f2 Merge pull request #2939 from FHenry/develop 
NEW Add control another invoice supplier already exists for created from supplier order (as it is done on customer invoice)
 2015-06-05 15:46:59 +02:00
Laurent Destailleur
67a9fa529f Merge pull request #2241 from defrance69/patch-44 
Update task.php
 2015-06-05 15:45:50 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
3c8d54d55f Merge pull request #2938 from FHenry/3.6 
FIX : If supplier invoice block linked element is display after other  block total HT amount is not reset to 0 and sum other block (like customer orders values)
 2015-06-05 15:43:25 +02:00
Laurent Destailleur
a8433aadbe Merge pull request #2962 from hregis/3.7_bug2 
Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
 2015-06-05 15:42:41 +02:00
Laurent Destailleur
d138e441f8 Merge pull request #2964 from atm-maxime/3.6 
Fix : supplier order clone was buggy if notes contains apostrophe
 2015-06-05 15:42:16 +02:00
Laurent Destailleur
d692f3a759 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-05 15:41:37 +02:00
Laurent Destailleur
b98999c9d9 Can't delete a project 2015-06-05 15:41:27 +02:00
Laurent Destailleur
3fac108af2 Can't delete a project 2015-06-05 15:39:23 +02:00
Laurent Destailleur
ee986b1a2b Debug merge thirdparty feature. 2015-06-05 15:15:05 +02:00
Laurent Destailleur
a33241f487 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00
Laurent Destailleur
5e2d9efa07 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:02:50 +02:00
Maxime Kohlhaas
f7493de50c Fix : supplier order clone was buggy if notes contains apostrophe 2015-06-05 13:42:29 +02:00
Laurent Destailleur
4c7ccf6145 NEW Can filter on contact status in prospect list. Removed deprecated 
menu entry.
 2015-06-05 10:49:02 +02:00
Laurent Destailleur
14b1fb845f Remove useless tab of categories 2015-06-05 09:57:41 +02:00
Laurent Destailleur
bbd8a712cf Merge pull request #2932 from GPCsolutions/dolibarr-2571 
Added tags/categories management to customers
 2015-06-05 09:44:06 +02:00
Regis Houssin
e78dba809b Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany 
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
 2015-06-05 09:42:21 +02:00
Laurent Destailleur
7c3f94d350 Merge pull request #2955 from hregis/develop_origin 
Fix: use encrypt/decrypt with llx_const for experimental encryption in
 2015-06-05 09:35:25 +02:00
Laurent Destailleur
a605040eac Merge pull request #2947 from aspangaro/develop-patch24 
NEW Forms are using the tab look, even in creation mode
 2015-06-05 09:34:52 +02:00
Laurent Destailleur
15060d973c Merge pull request #2958 from jfefe/patch-8 
FIX #2957 : missing $langs object for trigger
 2015-06-05 09:18:25 +02:00
Laurent Destailleur
ce104116f4 Merge pull request #2931 from GPCsolutions/dolibarr-2922 
Standardize categories types/ids management
 2015-06-05 09:09:14 +02:00
Laurent Destailleur
a1391ba8b7 Merge pull request #2959 from aspangaro/develop-patch22 
Fix: wrong file & problem to install model
 2015-06-05 09:07:29 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
aspangaro
fc5ea9f20f Fix: wrong file & problem to install model 2015-06-04 21:14:30 +02:00
jfefe
195a1b2708 FIX #2957 : missing $langs object for trigger 2015-06-04 18:10:29 +02:00
Regis Houssin
e1136b4758 Fix: use encrypt/decrypt with llx_const for experimental encryption in 
database of sensitive data
 2015-06-04 15:50:31 +02:00