Raphaël Doursenaud
c0862762a5
Fix #3930 Removed executable bit
...
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Laurent Destailleur
219cd0f855
Fixed: Translation
2014-12-20 15:52:50 +01:00
Laurent Destailleur
4f08408065
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
2014-11-05 16:28:44 +01:00
Laurent Destailleur
606a3f9917
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-11-04 17:54:09 +01:00
jfefe
c5045a75d8
Missing trans key into resource module
2014-10-30 01:16:37 +01:00
Juanjo Menent
039105a3f1
Fix: Invoices payments may be older than invoices. fr and es trans
2014-09-18 10:02:03 +02:00
jfefe
b7a2e3783e
Fix : missing translations
2014-08-30 11:11:51 +02:00
astebert
9c7647a7ae
Update bills.lang
...
Ligne 252 : Changement grammatical
- de "Paiements issue de l'acompte"
- en "Paiement issu de l'acompte"
2014-08-12 11:45:11 +02:00
Laurent Destailleur
bd29d3c7f4
Sync from transifex
2014-08-08 14:38:20 +02:00
Laurent Destailleur
80e8ff8db3
Sync from transifex
2014-08-01 02:01:51 +02:00
Laurent Destailleur
dbae31b982
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-07-18 20:17:18 +02:00
Laurent Destailleur
e94ffceac9
Transifex sync for 3.6
2014-07-18 20:16:46 +02:00
Cedric
769c9a9b66
FIX stock inconsistency when activating batch management on product which already have stock
2014-07-15 11:22:16 +02:00
Laurent Destailleur
dae7f8643b
Transifex sync
2014-06-22 23:37:20 +02:00
aspangaro
736561e8f0
Shop - Bad language file ("boutique" instead of "shop") & add language key
2014-06-17 06:31:20 +02:00
Laurent Destailleur
e04822a7c4
Sync from transifex
2014-06-10 02:22:50 +02:00
Laurent Destailleur
d219916f0a
Transifex sync
2014-05-30 16:47:24 +02:00
aspangaro
66d8b50159
Missing key language
2014-05-29 04:48:57 +02:00
aspangaro
e856e64bc9
Typo
2014-05-28 06:17:09 +02:00
Laurent Destailleur
39ce76ba1b
Sync from transifex
2014-05-18 12:25:20 +02:00
jfefe
e9453437f1
New : delete resource
2014-05-11 12:12:17 +02:00
jfefe
ba1fc07037
Uniformize langage files
2014-05-11 00:38:03 +02:00
Jean-François Ferry
d9c567ca3d
Prepare structure for upstream merge
2014-05-10 22:03:05 +02:00
Laurent Destailleur
584ddde5aa
Sync transifex
2014-05-10 15:33:34 +02:00
Laurent Destailleur
48bab56697
Transifex sync
2014-05-05 19:12:52 +02:00
Laurent Destailleur
93393db991
Merge pull request #1539 from defrance69/patch-7
...
Update index.php
2014-05-04 19:15:21 +02:00
BENKE Charles
769c793580
Update products.lang
2014-05-04 18:36:45 +02:00
Laurent Destailleur
dfb81e7997
Sync transifex
2014-05-02 16:52:32 +02:00
Florian HENRY
596be3ae44
Trad contact card
2014-04-29 09:43:16 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
philippe
8564691896
Fix some misspelling
2014-04-21 09:46:03 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
7fcf57ca5a
Fix: SQL request for export. Extra field missing.
2014-04-10 18:36:34 +02:00
Laurent Destailleur
a96f762f40
Sync from transifex.
2014-04-07 09:23:50 +02:00
Laurent Destailleur
5eeb6b8445
Fix: Use "Space" instead of " " when we need space as Thousand
...
Separator.
2014-04-06 23:43:32 +02:00
Laurent Destailleur
1c21c00fb6
New: Can use "Space" as value for SeparatorThousand into language files
2014-04-06 21:18:21 +02:00
Laurent Destailleur
d2b1b1a86c
Merge branch 'actiontriggers' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers
Conflicts:
htdocs/langs/de_DE/other.lang
2014-04-04 23:47:36 +02:00
Laurent Destailleur
897a9b7446
Sync from transifex.
2014-03-31 19:01:28 +02:00
Raphaël Doursenaud
cd7a378eb0
Action triggers/Langs: fixed a bad translation key
2014-03-27 12:04:03 +01:00
aspangaro
59128ccefb
Merge branch 'upstream/develop'
2014-03-17 21:10:15 +01:00
aspangaro
ed4b69d0ab
Update language key
2014-03-17 20:36:45 +01:00
Laurent Destailleur
302bcc2fd5
Translation: Sync from transifex.com
2014-03-17 16:15:00 +01:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
Laurent Destailleur
b1498c584d
Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into
...
KreizIT-dluo_step5
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-16 20:49:56 +01:00
Laurent Destailleur
7a304bff62
Merge pull request #1478 from atm-alexis/develop
...
Add feature : import line from origin invoice in the new credit note
2014-03-15 13:48:12 +01:00
Alexis Algoud
3a21d99edf
Add feature : import line from origin invoice in the new credit note
2014-03-15 12:01:13 +01:00
jean
4aa692c2a7
correction Magazin -> Magasin
2014-03-15 11:31:20 +01:00
KreizIT
3782742aad
- add batch management on supplier dispatch product
...
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
2014-03-15 10:28:01 +01:00
Laurent Destailleur
32364ac18b
Move skype module from experimental to stable.
2014-03-14 15:26:26 +01:00
Laurent Destailleur
743b0f1834
Merge pull request #1458 from KreizIT/dluo_step4
...
Dluo step4
2014-03-13 11:57:06 +01:00
