Marcos García
|
12971fa139
|
Corrected es_ES translations
|
2013-05-06 16:11:42 +02:00 |
|
simnandez
|
15ede98fe7
|
New: [ task #877 ] Reorganize menus. Init works
Add migration script 3.4 to 3.5
|
2013-05-04 01:22:09 +02:00 |
|
Laurent Destailleur
|
fc0d5abd14
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
|
2013-05-03 00:15:02 +02:00 |
|
Laurent Destailleur
|
fa497cf5fc
|
Fix: Trans and wrap
|
2013-05-02 18:25:27 +02:00 |
|
Marcos García
|
95f63a8171
|
Corrected some es_ES translations and fixed problems with translations not being translated
|
2013-05-01 20:43:08 +02:00 |
|
Laurent Destailleur
|
f8b4551ef6
|
Merge pull request #901 from marcosgdf/develop
Holidays module improvements
|
2013-04-29 10:28:47 -07:00 |
|
Marcos García
|
bf36376215
|
Corrected ca_ES translations
Translations made by Juanjo Menent (simnandez)
|
2013-04-29 18:05:11 +02:00 |
|
Marcos García
|
da9cbc6e58
|
Corrected translation key
|
2013-04-29 18:02:18 +02:00 |
|
simnandez
|
00adb1b9ab
|
Fix: [ bug #855 ] Holiday approval email in French
|
2013-04-29 12:46:07 +02:00 |
|
BENKE Charles
|
1d68a01298
|
Update projects.lang
Add Link element on elements page
|
2013-04-29 12:49:03 +03:00 |
|
Laurent Destailleur
|
f6c2bd4928
|
Fix: Uniformize menu conditions
|
2013-04-28 23:25:28 +02:00 |
|
Laurent Destailleur
|
80e470a4ce
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
|
2013-04-28 01:24:58 +02:00 |
|
Laurent Destailleur
|
7b85baa5e4
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-04-28 01:12:48 +02:00 |
|
Laurent Destailleur
|
2e81fa342e
|
Uniformize code, order of fiels in card and language files.
|
2013-04-28 01:12:40 +02:00 |
|
Laurent Destailleur
|
4c9a728799
|
Merge pull request #890 from marcosgdf/translations
Improved translations
|
2013-04-27 12:53:15 -07:00 |
|
simnandez
|
823b716042
|
Trad: Add ca_ES holiday translations
|
2013-04-27 17:52:14 +02:00 |
|
simnandez
|
d982148b7b
|
Fix: [ bug #855 ] Holiday approval email in French
|
2013-04-27 17:20:02 +02:00 |
|
Laurent Destailleur
|
e29f533b7a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
|
2013-04-27 15:15:31 +02:00 |
|
Laurent Destailleur
|
52952c6fce
|
Uniformize code for liste_array
Fix visibility of elements into product page (manage external users)
|
2013-04-27 15:08:35 +02:00 |
|
Marcos García
|
bd2b363e40
|
Modified traslation keys to reflect expected translation
|
2013-04-27 14:50:14 +02:00 |
|
Marcos García
|
8e7b72d09e
|
Fixed incorrect translations in holidays module
|
2013-04-27 14:42:37 +02:00 |
|
Marcos García
|
be5fcfdce3
|
Improved es_ES translations + replaced lang key in margins module admin page
|
2013-04-27 12:56:57 +02:00 |
|
Marcos García
|
36574771a6
|
Translation of barcode internal engine string
|
2013-04-27 12:49:19 +02:00 |
|
Marcos García
|
5784cb120a
|
Moved GenbarcodeLocation from products.lang to admin.lang
|
2013-04-27 12:32:20 +02:00 |
|
fhenry
|
c988944f1a
|
PDF admin : Add option to hide num TVA intra into adress of customer
|
2013-04-26 13:25:51 +02:00 |
|
Laurent Destailleur
|
271dcf578f
|
Fix: Better error message during import of csv with records split onto
several lines.
|
2013-04-25 23:49:24 +02:00 |
|
Laurent Destailleur
|
542a9608a7
|
Missing translation
|
2013-04-25 13:04:06 +02:00 |
|
fhenry
|
5789a5d6e9
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-04-24 17:53:59 +02:00 |
|
fhenry
|
d9551abb70
|
Fix trad for Extrafield from table
|
2013-04-24 17:32:08 +02:00 |
|
Laurent Destailleur
|
d3d2ffe43e
|
Qual: A better error management for suse rpm package
|
2013-04-24 16:16:41 +02:00 |
|
Laurent Destailleur
|
fb1c306b31
|
Update nl
|
2013-04-24 13:59:08 +02:00 |
|
Laurent Destailleur
|
f7aa90b3b3
|
Add user help
|
2013-04-24 12:43:23 +02:00 |
|
Laurent Destailleur
|
d5f3f47782
|
New: Use div for tabs.
|
2013-04-24 03:56:13 +02:00 |
|
Laurent Destailleur
|
7dce8d2306
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/launchpad/README
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
|
2013-04-23 14:04:56 +02:00 |
|
Laurent Destailleur
|
39d3d1a34e
|
Enhance script to send email to sale representatives
|
2013-04-23 12:00:31 +02:00 |
|
Laurent Destailleur
|
88fe3e86f2
|
Missing translation
|
2013-04-22 14:01:47 +02:00 |
|
Laurent Destailleur
|
b9dab6d059
|
Fix: Korting
|
2013-04-22 13:57:24 +02:00 |
|
Laurent Destailleur
|
5cbb0359aa
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-04-22 10:33:46 +02:00 |
|
Laurent Destailleur
|
ee843924dd
|
Fix: Some translation change to have things more clear.
|
2013-04-22 10:33:06 +02:00 |
|
Laurent Destailleur
|
89ad634230
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/hookmanager.class.php
htdocs/langs/fr_FR/holiday.lang
|
2013-04-22 01:39:49 +02:00 |
|
Laurent Destailleur
|
577346f44d
|
Merge pull request #863 from defrance69/patch-28
Update products.lang
|
2013-04-21 16:27:10 -07:00 |
|
Laurent Destailleur
|
64c94b1a4d
|
Merge pull request #862 from defrance69/patch-27
Update products.lang
|
2013-04-21 16:26:55 -07:00 |
|
Laurent Destailleur
|
11023fa210
|
Merge pull request #857 from marcosgdf/task-823
New: [ task #823 ] Shipping_validate email notification
|
2013-04-21 16:07:37 -07:00 |
|
Laurent Destailleur
|
9f3164d710
|
Merge pull request #849 from GPCsolutions/ca_report_improvments
Improved reports
|
2013-04-21 15:13:34 -07:00 |
|
Laurent Destailleur
|
42b3d6e317
|
Merge pull request #865 from FHenry/develop
Add extrafield select from table
|
2013-04-21 15:12:04 -07:00 |
|
Laurent Destailleur
|
5893fadb58
|
Look: Minor style enhancement
|
2013-04-21 17:56:29 +02:00 |
|
fhenry
|
d6514e1cd6
|
Add extrafield select from table
|
2013-04-21 17:36:23 +02:00 |
|
BENKE Charles
|
72e571fcd5
|
Update products.lang
Add Fabrication Feature
|
2013-04-21 16:16:13 +03:00 |
|
BENKE Charles
|
0a853c9c7c
|
Update products.lang
|
2013-04-21 16:14:40 +03:00 |
|
Marcos García
|
82e3a8d0b9
|
New: [ task #823 ] Shipping_validate email notification
|
2013-04-21 14:14:30 +02:00 |
|