Commit Graph

34239 Commits

Author SHA1 Message Date
Laurent Destailleur
d5de68b985 Merge pull request #504 from simnandez/develop
Qual: Uniformize withdrawals tabs
2012-11-29 14:05:13 -08:00
Regis Houssin
3005a4f7cf Fix: use specific code for avoid conflict 2012-11-29 18:37:37 +01:00
Regis Houssin
ffbeb38747 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-29 18:31:00 +01:00
Regis Houssin
583dfb225c New: add possibility to force label of buttons and hide the second
button for dialog info only
2012-11-29 18:30:16 +01:00
Laurent Destailleur
17e0aedebb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-29 13:20:53 +01:00
Laurent Destailleur
a62f2a7c8d New: Add vat rate for south africa. 2012-11-29 12:53:12 +01:00
Regis Houssin
36ca334821 FIXME: this return create an error in jenkins 2012-11-29 10:43:05 +01:00
Regis Houssin
d97f1937f8 Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!! 2012-11-29 10:25:33 +01:00
Regis Houssin
88fcfa9533 Fix: uniformize code 2012-11-29 10:23:47 +01:00
simnandez
f348fabf4d Qual: Uniformize withdrawals tabs 2012-11-29 09:34:10 +01:00
Laurent Destailleur
e62b3acef6 Fix: Translation 2012-11-29 01:59:31 +01:00
Laurent Destailleur
0b05d12e84 Fix: Bad picto 2012-11-29 01:27:24 +01:00
Laurent Destailleur
3d10689eca Qual: Maxi debug of withdrawal module. It is possible to understand how
it works now !
2012-11-29 01:18:57 +01:00
Laurent Destailleur
60fc84a4d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-29 00:07:21 +01:00
Laurent Destailleur
91e6087d1b Perf: Try to reduce amount of memory used to show events 2012-11-29 00:07:05 +01:00
Laurent Destailleur
9f02b6e5ac Merge pull request #502 from simnandez/develop
Trad: Add ca_ES and es_ES missing translations
2012-11-28 10:43:33 -08:00
Laurent Destailleur
8212700c41 Fix: EOL 2012-11-28 19:25:12 +01:00
Laurent Destailleur
b45ef4b578 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-28 19:19:56 +01:00
Laurent Destailleur
effe169850 Fix: pdf_getPDFFontSize must be after pdf_getInstance 2012-11-28 19:19:39 +01:00
simnandez
740810abca Fix: Select of notifications events is showed in french 2012-11-28 18:35:00 +01:00
simnandez
5c86d21941 Fix: Select of notifications events is showed in french 2012-11-28 18:31:52 +01:00
simnandez
f70bbded5f Trad: Add ca_ES and es_ES missing translations 2012-11-28 18:12:18 +01:00
Laurent Destailleur
fc83b47f99 Merge pull request #501 from atm-maxime/develop
Fix : multicompany compatibility + contact creation country field
2012-11-28 07:06:10 -08:00
Maxime Kohlhaas
a9941480f1 Fix : contact default country 2012-11-28 15:34:42 +01:00
Maxime Kohlhaas
2f743cd7f8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 15:32:27 +01:00
Laurent Destailleur
b1c13e373a Fix: A better fix to remove fk_pays. 2012-11-28 15:31:55 +01:00
Maxime Kohlhaas
5e5cb1da92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 14:53:48 +01:00
Laurent Destailleur
9139427d7f Fix: Country default not selected 2012-11-28 14:51:39 +01:00
Laurent Destailleur
caab5ac4e0 New: Add option to be able to select onto automatic event and manual
event (or both) into calendar view. Note: For backward compatibility
reason, this will works only for new events.
Qual: Disable old deprecated event code.
2012-11-28 14:47:30 +01:00
Laurent Destailleur
cbdcb50ce2 Merge pull request #499 from cbattarel/develop
show local taxes on invoice
2012-11-28 03:11:07 -08:00
Christophe Battarel
12284bf676 show local taxes on invoice 2012-11-28 12:04:31 +01:00
Laurent Destailleur
8fdf4aaf3b Merge pull request #498 from FHenry/develop
Add cancel button (go bask -1 history)
2012-11-28 02:37:00 -08:00
Laurent Destailleur
2b51132b32 Translation of localtax admin. 2012-11-28 11:34:52 +01:00
Laurent Destailleur
b34ce6e2f0 Merge pull request #495 from cbattarel/develop
[ task #204 ] Manage canadian, spain and other country double VAT with a generic system. various updates for local taxes
2012-11-28 02:08:07 -08:00
Maxime Kohlhaas
925e59e246 Fix : default country on contact creation was not set properly 2012-11-28 11:04:54 +01:00
fhenry
fca43941b0 Add cancel button (go bask -1 history) 2012-11-28 10:57:55 +01:00
Maxime Kohlhaas
32f5b4efa6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 10:57:51 +01:00
Christophe Battarel
b9cdde88c7 show localtaxes on einstein pdf model 2012-11-28 10:43:21 +01:00
Christophe Battarel
e8e4cc08de show localtaxes in order 2012-11-28 10:35:16 +01:00
Christophe Battarel
0e144dd7c3 fix wrong test for localtax assuj check 2012-11-28 10:32:24 +01:00
Christophe Battarel
f00b4b5527 correction to allow global local tax (type 7) on localtax1 2012-11-28 10:24:40 +01:00
Christophe Battarel
cee8e16e7e correct wrong check for localtaxes 2012-11-28 09:32:41 +01:00
Laurent Destailleur
65110ead88 Merge pull request #496 from FHenry/develop
Update Common Object update_contact method to allow to change the
2012-11-27 11:32:53 -08:00
Laurent Destailleur
7ee2ce3c21 Merge pull request #492 from atm-maxime/mko527
New : go directly into supplier invoice number field after cloning
2012-11-27 11:08:14 -08:00
Laurent Destailleur
da9ac187dd Merge pull request #493 from atm-maxime/mko545
Qual : clean unused code
2012-11-27 11:08:01 -08:00
Laurent Destailleur
53d997f59b Merge pull request #494 from atm-maxime/mko608
Task # 608 : add clone function on supplier order
2012-11-27 11:07:03 -08:00
Laurent Destailleur
85c702423e Merge pull request #497 from simnandez/develop
[ task #204 ] Manage canadian, spain and other country double VAT with a generic system. Add spanish tests
2012-11-27 11:01:25 -08:00
fhenry
5c94912e66 Add datehourpicker in editfieldval method to allow display of hour 2012-11-27 18:35:51 +01:00
simnandez
0bed303596 Trad: Added english (arabi saudia) into ca_ES and es_ES 2012-11-27 17:54:42 +01:00
simnandez
8dc0aec754 [ task #204 ] Manage canadian, spain and other country double VAT with a
generic system. Add spanish tests
2012-11-27 16:52:52 +01:00