Commit Graph

29521 Commits

Author SHA1 Message Date
Laurent Destailleur
008f5fbcfc New: extrafields are available onto users cards. 2012-11-30 15:55:59 +01:00
Regis Houssin
75fa37cde9 Fix: avoid warning in strict mode 2012-11-30 00:41:31 +01:00
Regis Houssin
c37ebea688 Fix: use $object->id instead $id for security 2012-11-30 00:35:38 +01:00
Regis Houssin
969b510a6a Fix: best method 2012-11-30 00:29:13 +01:00
Regis Houssin
5d1b5d5e0c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-30 00:06:54 +01:00
Regis Houssin
31785c8868 Fix: uniformize code 2012-11-30 00:06:25 +01:00
Laurent Destailleur
2ccf9462e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-29 23:12:31 +01:00
Laurent Destailleur
b12469c562 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/holiday/fiche.php
2012-11-29 23:12:16 +01:00
Laurent Destailleur
b507c12b13 Merge pull request #503 from atm-maxime/mko608
Qual : remove multi fetch
2012-11-29 14:08:03 -08:00
Laurent Destailleur
49a6c661fd Merge pull request #505 from FHenry/develop
Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into
2012-11-29 14:07:47 -08:00
Laurent Destailleur
d5de68b985 Merge pull request #504 from simnandez/develop
Qual: Uniformize withdrawals tabs
2012-11-29 14:05:13 -08:00
Laurent Destailleur
184cced303 New: Implement all call to allow to remove a tab by an external module 2012-11-29 23:02:02 +01:00
fhenry
a49bf61f33 Add AGENDA_USE_EVENT_TYPE configuration into Agande module configuration 2012-11-29 19:09:36 +01: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
fhenry
c3ced863c1 Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into
llx_c_actioncomm (id, code, type, libelle, module, active, position)
values ( 5, 'AC_RDV', 'system', 'Rendez-vous' ,NULL, ,1 1); - You have
an error in your SQL syntax; check the manual that corresponds to your
MySQL server version for the right syntax to use near '1 1)' at line 1
2012-11-29 17:59:28 +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
Maxime Kohlhaas
e3d6b0dd9e Fix : remove print_r... 2012-11-29 09:52:20 +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
Maxime Kohlhaas
19f3866b05 Fix : have to fetch object after create to reload values + thirdparty must be loaded if mode = create 2012-11-29 01:05:45 +01:00
Maxime Kohlhaas
1fc35d7d42 Fix : value returned after order confirm was 0 if update OK, and order page wasn't reloaded 2012-11-29 00:38:39 +01:00
Maxime Kohlhaas
0587b06cf4 Fix : global error print + no use of & for affectation 2012-11-29 00:20:24 +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
Maxime Kohlhaas
a6b6085772 Qual : remove multi fetch 2012-11-28 18:13:02 +01:00
simnandez
f70bbded5f Trad: Add ca_ES and es_ES missing translations 2012-11-28 18:12:18 +01: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