Commit Graph

60001 Commits

Author SHA1 Message Date
De Coninck Laurent
fd6c4fd4d0 fix the enabling of a dependency module already ON
If a depency module is already activated and we try to activate the parent, we got an error because the entry is already existing in the database.
2017-02-16 09:26:18 +01:00
De Coninck Laurent
979a5e70bf allow the drag and drop of an event only for allowed users
The drag and drop of the event didn't take into account the user rights.
2017-02-16 07:51:46 +01:00
Laurent Destailleur
a1ba4aa941 NEW: No external check of version without explicit click in about page. 2017-02-16 02:27:07 +01:00
Laurent Destailleur
ad890561c4 Prepare release 5.0 2017-02-16 02:00:34 +01:00
Laurent Destailleur
1a3b9fada5 Som fixes on generator of samples 2017-02-16 01:50:02 +01:00
Laurent Destailleur
abb3c810de FIX false error message in shipment card 2017-02-16 01:39:16 +01:00
Laurent Destailleur
0d1bb5e7eb FIX If bank module on, field must be required to register payment of
expense report.
2017-02-15 23:22:47 +01:00
Alexandre SPANGARO
c06aedc54d [FP17] : Add data in llx_accountancy_journal 2017-02-15 20:55:52 +01:00
Laurent Destailleur
ea4a83838c Missing not visible paramater 2017-02-15 18:30:27 +01:00
Laurent Destailleur
3803330701 NEW Add option PROJECT_THIRDPARTY_REQUIRED 2017-02-15 18:09:45 +01:00
Raphaël Doursenaud
d9f32f7ae1
Fix: [Multicurrency] properly display API error 2017-02-15 13:20:38 +01:00
florian HENRY
a98e5b7290 fix syntax 2017-02-15 11:46:36 +01:00
florian HENRY
5ec01b3175 NEW : Can send email to multiple destinaries from mailform 2017-02-15 11:41:09 +01:00
fmarcet
c175dfe68b Fix: Bad code makes don't work for external modules numeration model 2017-02-15 09:47:18 +01:00
florian HENRY
a26081d352 Merge branch 'develop' of local repository into dev_replace_extrefield_checkboxByMultiSelect 2017-02-15 09:10:49 +01:00
florian HENRY
e61da5d833 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_NEW_copyeventfiles 2017-02-15 09:10:13 +01:00
florian HENRY
89e6d86bf7 FIX #6411 2017-02-15 09:08:27 +01:00
BENKE Charlie
692dd0b5db contact email not display on tooltip
field not initialised
2017-02-15 01:22:20 +01:00
BENKE Charlie
a12a094172 $usemargins not used on global
because it's defined on the tpl file (line 42)
2017-02-15 01:11:25 +01:00
fmarcet
e903bf2b5c Fix: Bad code makes don't work for external modules numeration model 2017-02-14 18:55:39 +01:00
Laurent Destailleur
eb70d6eea1 Debug of feature for browser notifications 2017-02-14 18:20:01 +01:00
arnaud
977c18513d FIX pdf supplier payment work 2017-02-14 12:00:56 +01:00
Alexandre SPANGARO
66ff7fab34 Remove one step in accountancy index 2017-02-14 06:50:57 +01:00
Alexandre SPANGARO
d7614af96e Fix : Link to loan admin isn't required, already support by page default account 2017-02-14 06:45:12 +01:00
De Coninck Laurent
294517a8e0 use already existing variable 2017-02-13 16:49:10 +01:00
Laurent Destailleur
5de0d81dff Can force option according to country 2017-02-13 10:59:33 +01:00
a-schild
89c80a45c2 Use correct numeric format for all soldes 2017-02-13 09:34:35 +01:00
a-schild
4a19c14034 Use correct numeric format for all soldes 2017-02-13 09:33:01 +01:00
a-schild
7ba87d39fb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
# Conflicts:
#	htdocs/fourn/facture/impayees.php
#	htdocs/fourn/facture/paiement.php
#	htdocs/langs/de_DE/bills.lang
#	htdocs/langs/en_US/bills.lang
2017-02-13 09:21:57 +01:00
Laurent Destailleur
bcd624e5a5 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-13 01:37:53 +01:00
Laurent Destailleur
25e8caa64e Fix reversing test for a test 2017-02-13 01:37:12 +01:00
Laurent Destailleur
868f2e5473 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/update.php
	htdocs/core/lib/functions.lib.php
2017-02-13 01:36:02 +01:00
Laurent Destailleur
ae740b7c1b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/langs/en_US/errors.lang
2017-02-13 01:19:30 +01:00
Laurent Destailleur
bf32acaadd Fix control of module format. 2017-02-13 01:13:41 +01:00
Laurent Destailleur
32b1f4261b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-12 20:57:00 +01:00
Laurent Destailleur
abffd29179 Try a fix for #6334, #6416 2017-02-12 20:55:54 +01:00
Laurent Destailleur
cda301f6b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-12 20:51:52 +01:00
Laurent Destailleur
d4fd9bd71e Merge pull request #6414 from laudeco/fix/dictionnary_without_rowid
[FIX] Dictionaries without rowid
2017-02-12 20:46:43 +01:00
Laurent Destailleur
290caba160 Merge pull request #6413 from atm-gauthier/3.8_FIX_delete_bank_class_when_delete_bank_categ
FIX : delete bank class lines when we delete bank_categ
2017-02-12 20:45:57 +01:00
Laurent Destailleur
1dca3471db Merge pull request #6409 from IonAgorria/supplierorder-oldline
FIX: Fill oldline in supplier order updateline
2017-02-12 20:45:20 +01:00
Laurent Destailleur
b11f71386d Merge pull request #6412 from laudeco/feature/fix_card_page_generator
fix the card page generator
2017-02-12 20:43:30 +01:00
Laurent Destailleur
0e6ba5df4e Merge pull request #6410 from aspangaro/5.0-25
Fix : Bank account label not shown in dol_banner_tab
2017-02-12 20:42:38 +01:00
Laurent Destailleur
658330b971 Merge pull request #6408 from gnovaro/patch-6
Code style
2017-02-12 20:41:55 +01:00
Laurent Destailleur
38ab06984f Merge pull request #6407 from gnovaro/patch-5
Code style
2017-02-12 20:41:15 +01:00
Laurent Destailleur
953f737134 Merge pull request #6406 from gnovaro/patch-4
Code style
2017-02-12 20:40:44 +01:00
Laurent Destailleur
a8c5ba2983 Fix php7 error 2017-02-12 20:40:20 +01:00
Laurent Destailleur
2801c6e009 Merge pull request #6405 from gnovaro/patch-3
Move php values to js call
2017-02-12 20:36:04 +01:00
Laurent Destailleur
5233b8c87f Fix support for option MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES 2017-02-12 18:38:24 +01:00
Laurent Destailleur
05c9f57fd4 Move edition of emails templates out of dictionaries so we would be able
to have templates per user (not reserved to admin).
2017-02-12 18:13:49 +01:00
De Coninck Laurent
b356c34dc4 [mail; password; forgotten][#6334] - Fix mail url
Fix the mail url  on password generation
2017-02-12 17:22:06 +01:00