Commit Graph

37012 Commits

Author SHA1 Message Date
Laurent Destailleur
a8187c9158 Fix: Avoid duplicate emails 2013-05-15 23:07:43 +02:00
Laurent Destailleur
fb92e13650 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
2013-05-15 22:35:41 +02:00
Laurent Destailleur
b05548a633 Fix: Parameter delay not used when set to 0 2013-05-15 22:32:28 +02:00
Laurent Destailleur
b23d15c652 New: Can send unpaid invoices to all contacts. 2013-05-15 22:12:03 +02:00
Laurent Destailleur
4fede61c16 Update doc 2013-05-15 20:37:50 +02:00
Laurent Destailleur
ad84b83f02 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-15 20:24:08 +02:00
Laurent Destailleur
dd5b3f23e6 Merge pull request #951 from grandoc/3.4
fix some language issue
2013-05-15 11:23:17 -07:00
Laurent Destailleur
ff94849b0c Fix: Security test 2013-05-15 19:57:51 +02:00
Laurent Destailleur
bbb843ec58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-15 19:30:57 +02:00
Laurent Destailleur
85eac29925 New: Add balance before and after column 2013-05-15 19:30:32 +02:00
Laurent Destailleur
229ea064e9 Can use a list of bank receipt as parameter bank receipt 2013-05-15 18:19:02 +02:00
simnandez
2981d4a1ec Fix: Remove windows CR/LF 2013-05-15 18:14:37 +02:00
simnandez
33de1340d7 Fix: use default lang if lang not defined 2013-05-15 18:11:44 +02:00
Laurent Destailleur
011f782f23 Qual: Better check of parameters 2013-05-15 18:07:34 +02:00
Laurent Destailleur
49735b8d39 New: Add option "filter=bank" onto script rebuild_merge_pdf.php to
merge PDF that has one payment on a specific bank account.
2013-05-15 17:52:56 +02:00
Laurent Destailleur
626362780a Fix: Remove not used constant 2013-05-15 17:30:18 +02:00
Laurent Destailleur
a771d3f93e Fix: use default lang if lang not defined 2013-05-15 16:42:57 +02:00
Grand Philippe
2f53eacb4c fix personal value error 2013-05-15 15:40:10 +02:00
Grand Philippe
a8e260da84 fix some language issue 2013-05-15 15:28:53 +02:00
Laurent Destailleur
e95db78d50 New: Add script export-bank-receipts. 2013-05-15 13:41:31 +02:00
Laurent Destailleur
b17fe9fc00 New: Export support now autosize of column for excel export.
Fix: Bad charset when using script export-bank-receipts.
2013-05-15 13:37:31 +02:00
Laurent Destailleur
96dc851161 Doxygen 2013-05-15 13:24:18 +02:00
Laurent Destailleur
64ff559a80 Qual: Uniformize script headers 2013-05-15 11:24:18 +02:00
Laurent Destailleur
3a11e0baad New: Script export-bank-receipts should be ready for test. 2013-05-14 23:59:59 +02:00
Laurent Destailleur
f6dfcb756c Text cells must be left align into excel 2007 export. 2013-05-14 23:54:22 +02:00
Laurent Destailleur
d92b46c9f9 Fix: Label missing
Fix: Cancel not working
2013-05-14 23:41:57 +02:00
Laurent Destailleur
da4f13f387 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-14 23:40:51 +02:00
Laurent Destailleur
fe9e8aab5e Fix: Label missing
Fix: Cancel not working
2013-05-14 23:39:17 +02:00
Regis Houssin
d2aacdb04b Fix: avoid error when multiple files uploaded 2013-05-14 15:58:59 +02:00
Regis Houssin
179fc0a4cb Fix: avoid error when multiple files uploaded 2013-05-14 15:58:20 +02:00
Laurent Destailleur
551bcba826 Fix: Try to avoid warning 2013-05-14 10:51:09 +02:00
Laurent Destailleur
79d2dea26a Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/errors.lang
2013-05-14 03:04:42 +02:00
Laurent Destailleur
f9e0d03b0c Fix: Do not show busy if event not assigned to a user. 2013-05-14 02:46:00 +02:00
Laurent Destailleur
55c8522988 Update changelog 2013-05-14 01:34:24 +02:00
Laurent Destailleur
d7e9236455 Fix: Missing include 2013-05-14 01:31:04 +02:00
Laurent Destailleur
ee890a87a3 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Laurent Destailleur
95fac9aace Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:08:58 +02:00
Laurent Destailleur
83b35b5b64 Merge pull request #950 from aponzio/develop
Translateded missing entries "ThirdPartiesOfSaleRepresentative"
2013-05-13 16:08:27 -07:00
Laurent Destailleur
0d54294bcf Merge pull request #949 from marcosgdf/holidays-module
Improvement to holidays module
2013-05-13 16:07:56 -07:00
Laurent Destailleur
dc28335ed5 Merge pull request #948 from marcosgdf/translations
Improved translations
2013-05-13 16:07:22 -07:00
Laurent Destailleur
3898a77da1 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:05:18 +02:00
Laurent Destailleur
656f0bee70 Merge pull request #947 from grandoc/3.4
fix: center bloc was going under left menu
2013-05-13 16:05:06 -07:00
Laurent Destailleur
80817fd8fb Fix: translation 2013-05-14 01:04:21 +02:00
Laurent Destailleur
d5cc106a3a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:04:10 +02:00
Laurent Destailleur
cc20b000df Merge pull request #945 from zcattacz/translation
zh_cn/admin.lang reworkred
2013-05-13 15:46:32 -07:00
Laurent Destailleur
ea4b324e25 Merge pull request #943 from defrance69/patch-7
Update dolgraph.class.php
2013-05-13 15:41:36 -07:00
Laurent Destailleur
559bbdf19a Merge pull request #944 from defrance69/patch-8
Update annuel.php
2013-05-13 15:40:43 -07:00
Laurent Destailleur
273fbdfa0e Merge pull request #942 from FHenry/3.4
Remove warning if FetchObjectLinked call
2013-05-13 15:38:28 -07:00
Laurent Destailleur
0eba9ed731 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 00:13:53 +02:00
Laurent Destailleur
03cbe6e208 Fix: Can't read link with some styles 2013-05-13 23:46:37 +02:00