Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,937 Commits 36 Branches 189 Tags
df1dfcbd8a76d8d3432a80abeb30b856485f6250
Commit Graph

41293 Commits

Author SHA1 Message Date
Laurent Destailleur
df1dfcbd8a NEW Can filter proposal on a tag of a product 
Enhance also the prototype test_arrays to include select form before
table.
 2015-06-08 15:07:37 +02:00
Laurent Destailleur
e9526066b7 Prepare edition of field "bydefaultinlist" for extrafields. 2015-06-08 14:12:57 +02:00
Laurent Destailleur
4a18b730b5 Fix: Avoid warning in expense report validation 
Fix: navigation in expense report
 2015-06-08 13:49:09 +02:00
Laurent Destailleur
1e0218bb9b Merge pull request #2784 from aaujon/3.7-webservices-fix 
various fixes on webservices
 2015-06-08 10:37:29 +02:00
Laurent Destailleur
a85f664b7a Merge pull request #2950 from defrance69/patch-64 
if duration is present on service, we use it
 2015-06-08 10:35:23 +02:00
aspangaro
67c9a95ffb FIX: Correct migration script 2015-06-08 05:28:12 +02:00
BENKE Charlie
bcf9bdc92e Update card.php 
new setting vars FICHINTER_USE_SERVICE_DURATION
 2015-06-07 23:18:51 +02:00
Laurent Destailleur
101a9a4cf3 Fix: object user must not be overwritten 2015-06-07 19:35:47 +02:00
Laurent Destailleur
37cadaf4bf Fix the trigger on delete thirdparty was not called 2015-06-07 03:41:12 +02:00
Laurent Destailleur
dd08d5d660 Fix bad parameter for PUT method 2015-06-07 03:39:43 +02:00
Laurent Destailleur
c4ccf6f744 Fix: Missing the delete command 2015-06-07 00:06:11 +02:00
Laurent Destailleur
b89473383c Fix phpcs 2015-06-06 16:41:11 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
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
Arnaud Aujon
3fad8ffa80 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-06-06 13:39:37 +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
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
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
b98999c9d9 Can't delete a project 2015-06-05 15:41:27 +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