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

61626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rui Strecht
f1126b65bf Updated method to fetch state name, code and id to match method used with country 
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
 2017-09-20 12:06:35 +01:00
Rui Strecht
76a2513c76 Added self to contributors list 2017-09-18 17:49:31 +01:00
Rui Strecht
998eea09bd Added new option MAIN_SHOW_STATE_CODE (on/off; 1/0) to show state code in select fields options and values. 
Changed option MAIN_SHOW_REGION_IN_STATE to on/off - 1/0 and to mix with the new MAIN_SHOW_STATE_CODE (can show region name and state code)
 2017-09-18 16:48:13 +01:00
Rui Strecht
7848d99b2c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-18 16:42:40 +01:00
Laurent Destailleur
da6b1e92b2 NEW Add the total in the perday view of the time spent form. 2017-09-18 14:18:34 +02:00
Rui Strecht
e74f4b8b11 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-18 12:25:54 +01:00
Laurent Destailleur
85d59b32b3 Add timespent entry into HR top menu too 
Faster update of total of timespent
 2017-09-18 13:15:24 +02:00
Laurent Destailleur
1760972166 Merge pull request #7419 from hregis/develop_trad 
Fix: wrong image url and file not present
 2017-09-18 11:43:21 +02:00
Rui Strecht
0e1772cf66 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-18 10:43:05 +01:00
Laurent Destailleur
230644070b Better detection of log to include merge labels 2017-09-18 11:42:05 +02:00
Laurent Destailleur
cc1b7c06ef Merge pull request #7417 from defrance/patch-27 
NEW Can add link to other element on a donation
 2017-09-18 11:17:40 +02:00
Laurent Destailleur
594e13180a Merge pull request #7415 from azawawi/develop 
Fix example comment typo
 2017-09-18 11:16:55 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4 
Accountancy - Finish moving admin to specific menu & some cleaning
 2017-09-18 11:16:36 +02:00
Regis Houssin
bb0cb8adf4 Fix: remove unused file 2017-09-18 11:04:55 +02:00
Laurent Destailleur
dff4249e97 NEW Can include extrafields into member card templates 2017-09-18 10:48:49 +02:00
Regis Houssin
8389555882 Fix: wrong image url and file not present 2017-09-18 10:33:54 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
3f7b705674 Use correct term accounting for codes 2017-09-18 00:48:09 +02:00
Laurent Destailleur
aea7318fae Fix search on ref customer 2017-09-18 00:07:00 +02:00
Laurent Destailleur
d1fd1df345 Add column position on some dictionaries table 2017-09-17 22:52:29 +02:00
Laurent Destailleur
90ab6a1f30 Fix box activity again 2017-09-17 21:29:25 +02:00
Laurent Destailleur
f4b8489bd6 Fix box activity again 2017-09-17 21:24:30 +02:00
Laurent Destailleur
0ed5b329a7 Fix box activity again 2017-09-17 21:21:12 +02:00
Laurent Destailleur
e244ee6715 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-17 21:17:04 +02:00
Laurent Destailleur
196c5c1267 Missing translation 2017-09-17 20:51:06 +02:00
Laurent Destailleur
2c3428a1bf Fix css 2017-09-17 20:48:09 +02:00
BENKE Charlene
ae2e0a70ae Update card.php 2017-09-17 20:45:00 +02:00
BENKE Charlene
7ee0b1061b Link feature on donation 2017-09-17 20:43:42 +02:00
Laurent Destailleur
94368accc1 Fix activity box 2017-09-17 20:37:18 +02:00
Laurent Destailleur
fb15b2aab0 Fix activity box 2017-09-17 20:36:45 +02:00
Laurent Destailleur
ee774f1bf9 FIX Calculation in the activity box 2017-09-17 20:20:48 +02:00
Laurent Destailleur
bb73da4c5e Cherry pick 2017-09-17 20:20:27 +02:00
Laurent Destailleur
9dbd88f0ba FIX Calculation in the activity box 2017-09-17 20:17:51 +02:00
Laurent Destailleur
41e19e723b Fix look and feel v6 2017-09-17 20:05:36 +02:00
Laurent Destailleur
39acb46139 Fix multicompany 2017-09-17 19:44:59 +02:00
Laurent Destailleur
dece156a99 NEW Add supplier proposals into stats of product page. 2017-09-17 18:08:43 +02:00
Laurent Destailleur
a3c555049d NEW Add supplier proposals into stats of product page. 2017-09-17 18:08:23 +02:00
Laurent Destailleur
fa18e788b5 Fix must use photo of user 2017-09-17 17:29:00 +02:00
Laurent Destailleur
fc7d27c75c Fix bad constant 2017-09-17 17:19:18 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9 NEW Send by email available in bulk for expense report 2017-09-16 22:03:25 +02:00
Laurent Destailleur
b4eab24490 Add project into list of customer orders 2017-09-16 20:32:28 +02:00
Laurent Destailleur
432df8eacf NEW Enabled sending email in bulk actions for supplier orders 2017-09-16 20:31:33 +02:00
Laurent Destailleur
9e29ea8011 FIX Must use pdf format page as default for merging PDF. 2017-09-16 18:32:43 +02:00
Laurent Destailleur
0fec777d0e NEW On bulk email from a list, can uncheck "Join main document". 
NEW Show direct preview link on contract
 2017-09-16 18:31:30 +02:00
Laurent Destailleur
318e285ba2 NEW Add protection to avoid to send to much emails using builk actions 2017-09-16 16:00:58 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
c7e841b340 FIX Must use pdf format page as default for merging PDF. 2017-09-16 15:36:04 +02:00
Laurent Destailleur
97e8974fdf FIX Better protection to no send email when we change limit 2017-09-16 13:29:07 +02:00
Laurent Destailleur
e56b41c1ae Clean code 2017-09-16 13:28:13 +02:00