Commit Graph

8581 Commits

Author SHA1 Message Date
Laurent Destailleur
90bc859048 Fix trans 2018-02-05 02:34:49 +01:00
Laurent Destailleur
d24d401f3a Fix translation 2018-02-04 10:55:09 +01:00
Laurent Destailleur
7c6c893657 Merge pull request #7996 from atm-maxime/new_force_mailto
NEW Option to force all emails recipient
2018-02-03 19:15:11 +01:00
Laurent Destailleur
5c6dd0b061 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-03 19:00:04 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible.
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
2018-02-02 14:27:07 +01:00
Laurent Destailleur
7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
e9f8c7ba01 Fix edit of extrafields "link" corrupts the data definition 2018-01-31 10:51:40 +01:00
Laurent Destailleur
8d983717a3 Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user
NEW export filter models can be share or not by user
2018-01-29 21:19:50 +01:00
Laurent Destailleur
98c7ac9362 Merge pull request #8100 from ruistrecht-alt/label_for_MAIN_SHOW_REGION_IN_STATE
NEW: Option MAIN_SHOW_REGION_IN_STATE renamed into MAIN_SHOW_REGION_IN_STATE_SELECT and more complete
2018-01-29 21:08:18 +01:00
Laurent Destailleur
7bb46e65d7 Merge pull request #8103 from simnandez/7.0
Trad: more understandable extrafield translation to the end user
2018-01-29 20:45:42 +01:00
Laurent Destailleur
491e64db06 Fix various payments 2018-01-29 19:07:42 +01:00
Laurent Destailleur
4eb7d7a332 Debug blockedlog with various payments 2018-01-29 18:22:26 +01:00
Juanjo Menent
13adf06ae4 Trad: more understandable extrafield translation to the end user
Trad: fix english words
Trad: more accurate accounting translation
2018-01-27 15:48:11 +01:00
Laurent Destailleur
6cae36cc33 NEW Add key __USER_REMOTE_IP__ into available substitution variables 2018-01-26 17:23:30 +01:00
Laurent Destailleur
c5307e5cac Fix option MAILING_LIMIT_SENDBYWEB 2018-01-26 15:12:40 +01:00
Rui Strecht
e3c939ac83 Merge branch 'develop' into label_for_MAIN_SHOW_REGION_IN_STATE 2018-01-26 11:08:01 +00:00
Laurent Destailleur
4f9f1b51d7 Fix translation 2018-01-26 01:34:49 +01:00
Frédéric FRANCE
0568461a7b swiftmailer 2018-01-25 22:03:51 +01:00
Laurent Destailleur
cff1dc6827 Rename 2018-01-25 17:57:49 +01:00
Laurent Destailleur
e9441f7881 Fix name of log module to avoid confusion with blocked log 2018-01-25 17:56:46 +01:00
Rui Strecht
496ac644eb Updated label and added new translation for label 2018-01-25 16:10:04 +00:00
Laurent Destailleur
59c907260b Export of unalterablelog must contains init hash 2018-01-25 13:18:52 +01:00
Laurent Destailleur
8d7f6843a4 Must be able to export lockedlog for a dedicated year.
Fix date are nto humanly readable.
2018-01-25 12:57:36 +01:00
Laurent Destailleur
d796f403a9 Fix sender email when sending a password remind 2018-01-24 15:43:55 +01:00
Laurent Destailleur
f3b89d9d39 Add missing trans 2018-01-24 14:47:52 +01:00
Frédéric FRANCE
7ac286463f Update bills.lang 2018-01-22 17:23:59 +01:00
Laurent Destailleur
273e88a599 Fix send into ledger for expense report. Show accounted status. 2018-01-22 03:07:11 +01:00
Maxime Kohlhaas
53e6da8c7c Missing fetch and translation 2018-01-20 21:57:36 +01:00
Laurent Destailleur
9d0a0ed867 Fix demo 2018-01-19 12:55:03 +01:00
Laurent Destailleur
1730feeb4f Fix error message 2018-01-18 17:52:48 +01:00
atm-quentin
ce29331c05 NEW Filter export model by user 2018-01-18 12:34:22 +01:00
Laurent Destailleur
2e0ec5e76a Fix <br> 2018-01-17 13:17:33 +01:00
Laurent Destailleur
1a04178d64 Clean unused file and fix missing translation 2018-01-17 11:20:18 +01:00
Laurent Destailleur
926683763b Modulebuilde fix sort of fields, fix generation of files 2018-01-15 17:38:15 +01:00
Laurent Destailleur
133e87fcc3 Sync transifex 2018-01-14 12:45:26 +01:00
Laurent Destailleur
5fb8672221 Fix blockedlog. Browser can be used with large amount of events 2018-01-12 20:24:09 +01:00
Laurent Destailleur
3423d4e6d3 Fix balance is amount after, so i fix by adding amount before 2018-01-12 13:35:53 +01:00
Laurent Destailleur
b225a6f79c Better translation 2018-01-11 20:19:53 +01:00
Laurent Destailleur
e56d74f5c4 Fix generation of doc for supplier payment 2018-01-11 19:01:47 +01:00
ATM-Nicolas
30c6891b95 NEW : Add product categories filter on product margin 2018-01-10 11:17:23 +01:00
Laurent Destailleur
35a710a8ed Missing translation 2018-01-05 17:50:05 +01:00
Laurent Destailleur
332ee53c22 Fix module blockedlog for donation 2018-01-05 12:43:53 +01:00
Laurent Destailleur
dbf7603118 Debug blockedlog for loi finance 2016 2018-01-05 04:31:48 +01:00
Laurent Destailleur
59ed23069c Fix debug accounting module 2018-01-04 15:52:07 +01:00
Laurent Destailleur
04dd0663ff Fix translation 2018-01-04 12:17:32 +01:00
Laurent Destailleur
534cbcb941 Debug translation 2018-01-03 20:59:35 +01:00
Laurent Destailleur
6676178435 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/list.php
	htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Maxime Kohlhaas
d770f73219 Add option translation 2017-12-26 16:21:15 +01:00
Laurent Destailleur
2b056b0177 BUG Fix of old hidden feature price per quantity 2017-12-22 12:53:46 +01:00
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00