Commit Graph

41707 Commits

Author SHA1 Message Date
Marcos García de La Fuente
32e46030b9 Missing translation in export module 2014-05-01 16:10:11 +02:00
Marcos García de La Fuente
7f9f7aa84e Fixed problems with shared folders in Mac. Won't affect other OS 2014-05-01 13:21:09 +02:00
Marcos García de La Fuente
6037777e52 Ignored auto generated RSA keys 2014-05-01 13:20:38 +02:00
Marcos García de La Fuente
80bd018815 Updated Puphpet vagrant box to latest version 2014-05-01 12:32:23 +02:00
Laurent Destailleur
fc9c491d15 New: Add constant to set label for level prices. 2014-05-01 12:19:24 +02:00
Laurent Destailleur
9dd605bd8a Simplify and comment code 2014-05-01 11:54:48 +02:00
Laurent Destailleur
7070ee36ee Merge branch 'aternatik-odt_thirdpartycontact' into develop 2014-05-01 11:23:15 +02:00
Laurent Destailleur
0219d53f69 Merge branch 'odt_thirdpartycontact' of github.com:aternatik/dolibarr into aternatik-odt_thirdpartycontact 2014-05-01 11:22:32 +02:00
Laurent Destailleur
1c0b0ef8c9 Merge branch 'aspangaro-develop' into develop 2014-05-01 11:20:16 +02:00
Laurent Destailleur
6a200105b9 Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop

Conflicts:
	ChangeLog
2014-05-01 11:16:42 +02:00
Laurent Destailleur
3719fc1234 Merge pull request #1557 from defrance69/develop
export extrafields on bill & set real ref bordereau number
2014-05-01 11:09:16 +02:00
Laurent Destailleur
569d4cfd41 Merge pull request #1556 from FHenry/develop
Enable option clone target emailing
2014-05-01 11:08:05 +02:00
Juanjo Menent
3b97e1ae1c Trad: Update es_ES from transifex 2014-05-01 09:42:38 +02:00
Juanjo Menent
cdf5155d87 Trad: Update es_ES from transifex 2014-05-01 09:22:31 +02:00
aspangaro
270e58637f Salaries payments :: Add sortfield & search 2014-05-01 08:58:19 +02:00
aspangaro
ca0b6c26df Translation 2014-05-01 08:19:55 +02:00
aspangaro
3b265c8d53 TVA :: Add sortfield & search 2014-05-01 07:44:10 +02:00
aspangaro
c6e2afb11e Social contrib. :: Replace index.php by $_SERVER["PHP_SELF"] 2014-05-01 05:57:27 +02:00
aspangaro
501b7209de Move module trips into family "hr" 2014-05-01 04:57:49 +02:00
jfefe
fd45bb16bd Fix : make ODT substitution for company after contacts 2014-04-30 19:18:51 +02:00
Laurent Destailleur
a574aeff96 Qual: Removed warning 2014-04-30 15:30:20 +02:00
Laurent Destailleur
b11bd00e9a Fix: Removed blank lines at beginning of email when contact not defined 2014-04-30 15:17:39 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
Laurent Destailleur
518c40d79a Mise à jour fichier .md 2014-04-30 13:01:01 +02:00
Jean-François Ferry
00cd616f4c Add informations about contacts of thirdparty into ODT 2014-04-30 10:36:23 +02:00
aspangaro
d1392f7a5f Changelog 2014-04-30 06:58:14 +02:00
aspangaro
4caedaf3e5 Salaries : typo & presentation 2014-04-30 06:38:36 +02:00
aspangaro
eb926103e0 TVA : Add type_payment & num_payment who are missing 2014-04-30 06:37:47 +02:00
aspangaro
11b0bc4b38 Merge branch 'upstream/develop' 2014-04-30 04:58:07 +02:00
Laurent Destailleur
a02a8a0ef9 Update screenshots 2014-04-30 00:33:16 +02:00
Laurent Destailleur
a9869802f4 Add link to setup page 2014-04-30 00:22:27 +02:00
Laurent Destailleur
11115eb773 Fix: Bad link
Trans: Add missing translation keys.
2014-04-29 23:34:36 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
BENKE Charles
468f6fd5fb Update modFournisseur.class.php
Add extrafields export feature on bill
2014-04-29 11:57:51 +02:00
BENKE Charles
b283ed73d1 Update modFacture.class.php
add export extrafields feature
2014-04-29 11:53:04 +02:00
Florian HENRY
596be3ae44 Trad contact card 2014-04-29 09:43:16 +02:00
aspangaro
06b386443d Merge branch 'upstream/develop' 2014-04-29 06:37:39 +02:00
Florian HENRY
91505fdebe changelog 2014-04-28 17:24:14 +02:00
Florian HENRY
79fabb05b5 changelog 2014-04-28 17:23:13 +02:00
Florian HENRY
7a46bdfc55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog
2014-04-28 17:20:40 +02:00
Florian HENRY
dddbc37d35 Enable option clone target emailing 2014-04-28 17:18:11 +02:00
Laurent Destailleur
c08c900602 Fix: amount is not a type 2014-04-28 12:17:25 +02:00
Laurent Destailleur
4cb671f4db Qual: Clean deprecated code. 2014-04-28 11:55:08 +02:00
Laurent Destailleur
ec69fe1210 Start to tune setup of scrutinizer 2014-04-28 11:14:54 +02:00
aspangaro
bab54f8264 Type bank & tva 2014-04-28 06:41:27 +02:00
aspangaro
73eec6b872 Fix :: Key language "Thirdparty" not traduced when module thirdparty is deactivated 2014-04-28 04:53:39 +02:00
aspangaro
66b4139e8f Merge branch 'upstream/develop' 2014-04-28 04:44:18 +02:00
aspangaro
9ff3dc6189 Fix :: MySql Problem when create a salary payment 2014-04-28 04:43:17 +02:00
Laurent Destailleur
e5012a1670 Fix: Bad parameter type 2014-04-28 04:27:49 +02:00
Laurent Destailleur
d004d41d2f Fix: Remove tabs 2014-04-28 03:12:20 +02:00