Commit Graph

46423 Commits

Author SHA1 Message Date
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
3a9c195f10 Fix hook management match spec 2015-03-20 00:34:55 +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
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
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
Laurent Destailleur
1f6d27ceb7 Merge pull request #2454 from defrance69/patch-53
Update pdf_paiement.class.php
2015-03-16 01:57:28 +01:00
Laurent Destailleur
60c72e13b3 Some fixes into export and translation 2015-03-15 23:39:53 +01:00
Laurent Destailleur
79ca1fe147 Clean code. 2015-03-15 23:32:43 +01:00
Laurent Destailleur
73581931cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-15 23:22:58 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
BENKE Charles
8f0e514f83 Update pdf_paiement.class.php
Add bank account on detail line (usefull when you have many bank account)
Add society name in the header (usefull when you nanage many society)
2015-03-15 10:49:16 +01:00
Laurent Destailleur
c197e00090 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-14 14:57:58 +01:00
Laurent Destailleur
10bbf463e7 Several bug fixes from scrutinizer 2015-03-14 14:55:41 +01:00
Laurent Destailleur
cfdf12950b Merge pull request #2452 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2015-03-14 14:34:06 +01:00
Scrutinizer Auto-Fixer
cbacfa3137 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-14 13:30:19 +00:00
Laurent Destailleur
c06ff8acd9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-14 14:30:09 +01:00
Laurent Destailleur
44d6bdb1c5 Doc 2015-03-14 14:27:45 +01:00
Laurent Destailleur
ecbee5d4dc Merge pull request #2450 from defrance69/patch-52
New type of extrafields : link to connect dolibarr elements
2015-03-14 14:18:19 +01:00
Laurent Destailleur
c45ec24958 Merge pull request #2379 from atm-maxime/develop
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
2015-03-14 14:08:38 +01:00
Laurent Destailleur
2b7c95a86d Merge remote-tracking branch 'origin/3.6' into 3.7 2015-03-14 13:46:45 +01:00
Laurent Destailleur
c4ff66c5d7 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-03-14 13:46:18 +01:00
Laurent Destailleur
a9eebb33fd Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-03-14 13:45:27 +01:00