Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 16:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,465 Commits 36 Branches 190 Tags
8e58ef5ce2725e6757ea0fe5cb15014928d6affa
Commit Graph

13457 Commits

Author SHA1 Message Date
Laurent Destailleur
d1bee67b40 FIX #3991 2017-09-26 13:09:19 +02:00
florian HENRY
6fcfe89565 NEW : lettrage in accountancy 2017-09-26 13:02:29 +02:00
Laurent Destailleur
e140878458 NEW Can import local tax rates in prices 2017-09-26 13:00:09 +02:00
Papoteur
cc9954e95e Clean debug messages 2017-09-26 12:51:14 +02:00
Papoteur
50d639f1fa Add total and subtotal in payments reports 2017-09-26 12:10:51 +02:00
Laurent Destailleur
49982b36ac FIX #7490 2017-09-26 11:55:19 +02:00
Papoteur
cbe1683fe7 Invoice number on one line instead of two (issue#7487) 2017-09-26 11:30:28 +02:00
Papoteur
d2c55ea07b Factorize code between payments reports client/provider 2017-09-26 11:27:53 +02:00
Laurent Destailleur
5482f80c0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1 FIX #7473 Mass update of vat rates and other bugs on localtax 2017-09-26 10:29:44 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
919d29fdf7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-25 19:45:40 +02:00
Laurent Destailleur
fe55feb82f FIX #7461 2017-09-25 19:45:01 +02:00
Laurent Destailleur
dc362fcd30 NEW Can show currency in list of bank accounts 2017-09-25 18:11:03 +02:00
Laurent Destailleur
fcdbc66bb1 Merge pull request #7122 from atm-florian/develop_fixtransfert 
NEW : Can transfer from bank account to bank account with different currencies
 2017-09-25 17:36:52 +02:00
Laurent Destailleur
aeeda250c7 Merge pull request #7443 from salnaSrc/myFixes 
Add hidden option WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS
 2017-09-25 17:28:28 +02:00
Inovea Conseil
35ae0e435d Fix quote in input 
Delete a quote in input field
 2017-09-25 16:14:14 +02:00
Laurent Destailleur
7b9facc76a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-25 11:43:12 +02:00
Laurent Destailleur
a9fabf117e Code comment 2017-09-25 11:42:59 +02:00
Laurent Destailleur
53d931dd11 Merge pull request #7481 from dolibarr95/patch-17 
Fix 7470
 2017-09-25 11:34:00 +02:00
Inovea Conseil
d3d6fca350 Missing space in request 
Fix bug in request
 2017-09-25 10:49:56 +02:00
dolibarr95
6ee15f1c45 Fix 7470 
php warning when  MAIN_MODULE_xxxxx_DIR exists but the module does not have a directory.
 2017-09-25 09:01:47 +02:00
Regis Houssin
d592664150 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-09-25 06:48:26 +02:00
Regis Houssin
92ff974c5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-25 06:47:34 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Laurent Destailleur
2285e9bc0b Merge branch 'develop' into develop_trad 2017-09-24 21:47:17 +02:00
Laurent Destailleur
971e59395c Fix phpcs 2017-09-24 21:46:14 +02:00
Laurent Destailleur
2e511badf9 Code comment 2017-09-24 21:02:20 +02:00
Laurent Destailleur
3482b12933 Comment deprecated js code 2017-09-24 20:55:48 +02:00
Laurent Destailleur
4246cf24f3 Perf enhancement: Remove one include of js. 2017-09-24 20:36:27 +02:00
Laurent Destailleur
49e9326a6d Code comment 2017-09-24 19:50:32 +02:00
Regis Houssin
06ee9f4775 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-24 16:10:55 +02:00
Regis Houssin
0cdca6f3eb Fix: phpcs error 2017-09-24 11:10:33 +02:00
Laurent Destailleur
91d303465d NEW Can add html content on right of tabs 2017-09-24 01:39:06 +02:00
Laurent Destailleur
b4e461e7ea Debug modulebuilder 2017-09-23 18:17:34 +02:00
Laurent Destailleur
bee94b32d9 Debug modulebuilder 2017-09-23 15:12:25 +02:00
Laurent Destailleur
414f633e75 Fix css 2017-09-23 12:59:49 +02:00
Laurent Destailleur
35d00fd2ec Fix wrap on lites_total 2017-09-23 09:28:31 +02:00
Laurent Destailleur
839f3ca41d NEW Can use an url like $conf->global>-MYPARAM for menu urls 2017-09-23 03:22:48 +02:00
Laurent Destailleur
a94f2b07e1 Fix css 2017-09-23 02:46:33 +02:00
Laurent Destailleur
57adc28256 Work on modulebuilder 2017-09-23 01:45:03 +02:00
Laurent Destailleur
96aed9c29d Work on modulebuilder 2017-09-22 23:38:25 +02:00
Regis Houssin
791c385e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ldap

Conflicts:
	htdocs/adherents/card.php
 2017-09-22 20:26:22 +02:00
Laurent Destailleur
63ec14e47d Convert sode to send member info email into new generic email template 
system.
 2017-09-22 20:18:11 +02:00
Laurent Destailleur
f990667b1a NEW Can send email from the member card using email templates. 2017-09-22 17:48:38 +02:00
Laurent Destailleur
8578a1b825 NEW Option "one email per recipient" when using bulk actions emails. 2017-09-22 17:04:26 +02:00
Laurent Destailleur
6d7db96359 NEW Option "one email per recipient" when using bulk actions emails. 2017-09-22 16:31:05 +02:00
Laurent Destailleur
d4bde2a4ea Fix date substitution for contracts 2017-09-22 15:12:36 +02:00
Laurent Destailleur
252f038468 Mutualize code of substitutions for emails 2017-09-22 14:34:31 +02:00
Laurent Destailleur
bd45ea5a03 Split page for invoice template into card + list. Add more filters. 2017-09-22 11:28:53 +02:00