Frédéric FRANCE
76d08ab7f5
Update config
2018-08-29 23:05:09 +02:00
Laurent Destailleur
2e891b5694
Trans
2018-06-06 11:20:35 +02:00
Alexandre SPANGARO
675ae97f99
Update module assets (Add asset directory & langs)
2018-05-13 21:52:11 +02:00
Laurent Destailleur
2e296b3475
remove incoterm file
2018-03-27 00:05:57 +02:00
Laurent Destailleur
8048259733
Work on ticket module integration
2018-03-13 12:13:47 +01:00
Laurent Destailleur
9e33baf0d6
Prepare package for 6.0beta
2017-06-10 01:09:11 +02:00
Laurent Destailleur
57ba598b15
Merge pull request #6771 from aspangaro/6.0-stripe
...
New : Module Stripe
2017-05-13 19:55:29 +02:00
Laurent Destailleur
c26d24e97d
Work on module builder
2017-05-09 00:00:09 +02:00
Alexandre SPANGARO
942b58efaf
New : Integration of Stripe
2017-02-22 06:33:52 +01:00
Laurent Destailleur
63ad970a27
Sync transifex
2016-07-07 04:26:22 +02:00
Laurent Destailleur
c07bb2dd5c
Add translation file for website module
2016-02-19 18:51:31 +01:00
Laurent Destailleur
1fb1da5be4
Work on website module
2016-02-02 16:24:12 +01:00
Laurent Destailleur
dfc01e971f
Update files for transifex sync
2015-11-15 20:27:43 +01:00
Laurent Destailleur
f3b8df3ea5
Merge pull request #3889 from frederic34/escpos
...
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
frederic34
1a374ddd2c
Receipt Printer conf and lang
2015-11-05 08:42:03 +01:00
frederic34
b6be372c4b
Merge remote branch 'upstream/develop' into printgcp
2015-10-30 18:12:34 +01:00
frederic34
1694c690ed
Printing with Google Cloud Print
2015-10-30 17:22:06 +01:00
aspangaro
11387a5d38
Add language file
2015-10-10 06:37:43 +02:00
Laurent Destailleur
9f6ebcd123
Sync from transifex
2015-07-15 15:56:42 +02:00
aspangaro
414d4c6432
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-03-22 18:08:12 +01:00
Laurent Destailleur
b0b88be81f
Sync transifex
2015-03-18 15:27:27 +01:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
Laurent Destailleur
0ef2369399
Enhance tools to make transifex sync
2015-03-14 02:37:18 +01:00
aspangaro
63099727d0
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2015-02-21 15:10:35 +01:00
Laurent Destailleur
6adfc6f6f4
Work on batch module. Add batch, eatby and sellby into movement table.
...
Clean language files for direct print module.
2015-02-12 15:23:31 +01:00
frederic34
be60c13de6
WIP Printing System
2014-12-08 20:33:26 +01:00
Raphaël Doursenaud
0bd295dca7
Transifex: added missing language files to the configuration
2014-11-28 16:05:25 +01:00
Raphaël Doursenaud
732f235c06
Transifex: removed forgotten oscommerce language files
2014-11-28 15:59:29 +01:00
aspangaro
aa4f16ce99
Add resource language file in transifex
2014-11-23 21:02:49 +01:00
aspangaro
25433120e6
Merge remote-tracking branch 'Upstream/develop' into develop-loan
2014-11-04 06:16:03 +01:00
Laurent Destailleur
815c79270d
End of cleaning shop
2014-10-14 12:44:13 +02:00
aspangaro
f51df9da70
Add loan language file
2014-09-22 08:24:58 +02:00
Laurent Destailleur
7e491c479c
Add accountancy language file
2014-09-19 11:24:47 +02:00
Laurent Destailleur
6917b97420
Fix: Missing link.lang file into transifex sync.
2014-08-01 11:13:13 +02: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
4d31a0ca2a
Fix: Removed duplicate line
2013-11-18 14:27:17 +01:00
Laurent Destailleur
0ed2f4b891
Trans: Add usbek language
2013-11-11 22:25:32 +01:00
Laurent Destailleur
c041774950
Trans: First try to commit files pulled from transifex.
2013-05-26 15:37:50 +02:00
Laurent Destailleur
600598e591
Work on transifex
2013-05-26 14:47:06 +02:00
Laurent Destailleur
e41542a219
Start to test transifex
2013-05-26 13:57:55 +02:00
