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

46446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
eb7f2f464e Merge branch 'IonAgorria-price-global-variables' into develop 2015-03-22 12:45:21 +01:00
Laurent Destailleur
55140afde4 Merge branch 'price-global-variables' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/dynamic_price/editor.php
 2015-03-22 12:45:04 +01:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
 2015-03-22 12:10:39 +01:00
Laurent Destailleur
c9b569ad1a Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:31:11 +01:00
Laurent Destailleur
4f9aef6150 Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:29:23 +01:00
Laurent Destailleur
73266bb965 Fix error when using a log hangler that make output into the http 
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
 2015-03-21 01:22:05 +01:00
Laurent Destailleur
b8ed553365 We must keep the @, some tools use it to know it is login page. 2015-03-21 01:08:29 +01:00
Laurent Destailleur
33d98b52b5 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-20 20:51:50 +01:00
Laurent Destailleur
eeb09b83a1 The test on db version must not lock the phpunit 2015-03-20 20:50:46 +01:00
Laurent Destailleur
9e0aa22a04 Merge pull request #2461 from tiaris/3.7_langs_error 
Add global $langs to method, necessary for triggers to function
 2015-03-20 20:43:16 +01:00
Laurent Destailleur
0784e9638a The test on db version must not lock the phpunit 2015-03-20 17:57:40 +01:00
Laurent Destailleur
b0e928c213 Disable migration with bugged versions 2015-03-20 15:26:00 +01:00
Laurent Destailleur
2d3c3e63e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-20 15:19:52 +01:00
Laurent Destailleur
92af226fff Fix Not into official 3.7 but must be into migration for 3.7 when 
migration is done by 3.8 code
 2015-03-20 15:19:42 +01:00
Laurent Destailleur
5e84ce69ca Fix code to avoid callback usage (this fails on some php) 2015-03-20 12:07:34 +01:00
Laurent Destailleur
3a9c195f10 Fix hook management match spec 2015-03-20 00:34:55 +01:00
Laurent Destailleur
d442ac328c Fix: some replacement tags were missing 2015-03-19 12:34:03 +01:00
Laurent Destailleur
f44d91e153 NEW: The notification module accept keyword __SUPERVISOR__ to send 
notification to supervisor of user.
 2015-03-19 11:47:30 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of 
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
 2015-03-18 21:44:57 +01:00
Laurent Destailleur
a2676e5768 Fix: the type of notification sent was not filled 2015-03-18 21:06:55 +01:00
Laurent Destailleur
b0b88be81f Sync transifex 2015-03-18 15:27:27 +01:00
Laurent Destailleur
ba526c5a2f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-18 14:32:58 +01:00
Laurent Destailleur
cd2fc2f890 Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook 
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
 2015-03-18 14:31:37 +01:00
Laurent Destailleur
2c61717e10 Fix sql syntax error 2015-03-18 14:19:17 +01:00
Laurent Destailleur
bbef07ef3d Finished prototype to use hook to add a column by a module. 2015-03-18 14:08:37 +01:00
Laurent Destailleur
7ef11b2f38 Fix selected attribute not set correctly 2015-03-18 13:16:59 +01:00
Laurent Destailleur
dd82ad69fe printLeftBlock is now compliant with hook development rules. It is an 
"addreplace" hook so you must return content by doing
->resprints='mycontent' and not by doing return 'mycontent'
 2015-03-18 12:30:49 +01:00
Laurent Destailleur
426835781a Fix hook usage 2015-03-18 12:03:47 +01:00
Laurent Destailleur
840b047468 Work on new timesheet input pages. 2015-03-18 11:20:08 +01:00
Laurent Destailleur
5d4d8151c1 Work on new timesheet input pages. 2015-03-18 11:04:50 +01:00
Laurent Destailleur
37c216cfe4 Fix limit for very slow os. 2015-03-17 15:43:11 +01:00
jean
9e9a8894ea Add global $langs to method, necessary for triggers to function 
correctly
 2015-03-17 14:20:08 +01:00
Laurent Destailleur
c700d8a8ec Fix remove warning 2015-03-17 11:59:44 +01:00
Laurent Destailleur
166fda4909 Normalize class names 2015-03-17 11:26:23 +01:00
Laurent Destailleur
6e251690ab Doxygen 2015-03-17 11:23:45 +01:00
Laurent Destailleur
84bea6166e Doxygen 2015-03-17 10:55:45 +01:00
Laurent Destailleur
4fffeb3a89 Clean code 2015-03-17 10:52:27 +01:00
Laurent Destailleur
689d270552 Doxygen 2015-03-17 10:47:20 +01:00
Laurent Destailleur
bfd979224f Var not declared 2015-03-17 10:38:25 +01:00
Laurent Destailleur
a73ff524e5 Merge pull request #2459 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2015-03-17 00:38:40 +01:00
Laurent Destailleur
435be30047 Clean code 2015-03-17 00:35:17 +01:00
Laurent Destailleur
6f7b07548c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-17 00:23:49 +01:00
Laurent Destailleur
c65f1aea82 Merge pull request #2458 from mrsof/patch-2 
FIX : Force ref
 2015-03-17 00:23:39 +01:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00:00
Laurent Destailleur
141fa56d67 Fixed bad parameter 2015-03-17 00:11:04 +01:00
Laurent Destailleur
6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang
 2015-03-16 18:30:30 +01:00
Laurent Destailleur
04c88b0d94 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-16 18:26:07 +01:00
Laurent Destailleur
bc4ecf8619 Fix the debug option must works for admin user 2015-03-16 18:25:26 +01:00
Sof
88d9f7f0f1 FIX : Force ref 
Even if you set ref in object class Commande, ref will be set to '(PROVid)' until you call 'valid' function
 2015-03-16 12:23:25 +01:00
Laurent Destailleur
daf853d040 Merge pull request #2455 from aspangaro/develop-ReviewER 
QUAL: Traduce terms + remove <center>
 2015-03-16 02:11:29 +01:00