lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

392 Commits

Author SHA1 Message Date
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00
Laurent Destailleur
9dcec5d6cf Sync transifex 2017-11-28 12:32:23 +01:00
Laurent Destailleur
6953420ce8 Support for ar_EG as laternative of ar_AS 2017-11-19 21:25:21 +01:00
Laurent Destailleur
219364703f Sync transifex 2017-11-01 10:48:21 +01:00
Laurent Destailleur
e41dcd173e Sync language 2017-10-19 17:55:24 +02:00
Laurent Destailleur
7d9a18a63d Fix sql error 2017-08-24 15:39:23 +02:00
Laurent Destailleur
32eb2aba43 Sync transifex 2017-08-02 15:30:46 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
504d376f84 Sync transifex 2017-06-19 21:34:33 +02:00
Laurent Destailleur
28ad50e059 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/suppliers.lang
 2017-03-03 14:31:35 +01:00
Laurent Destailleur
807eb56807 Add BHD currency 2017-03-03 13:15:20 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
6c40110613 Sync transifex 2017-02-21 10:26:11 +01:00
Andreas Pachler
ae3ace7e94 added additional payment terms often needed in Austria 2017-02-08 12:46:42 +01:00
Laurent Destailleur
105a53b333 Merge pull request #6333 from atm-quentin/Mass_withdrawal_request 
NEW Mass withdrawal request
 2017-01-27 00:55:16 +01:00
Quentin Vial-Gouteyron
6011c98515 FIX payment method exception 2017-01-24 12:22:23 +01:00
Quentin Vial-Gouteyron
39a92df647 Massive withdrawal request 2017-01-24 11:50:07 +01:00
Laurent Destailleur
05582e9586 Sync transifex 2017-01-23 17:31:09 +01:00
Laurent Destailleur
7ec4bc055a Sync transifex 2016-12-10 11:51:55 +01:00
Laurent Destailleur
55e367742a Sync transyfex 2016-11-06 12:50:32 +01:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
f0fa9205a2 Sync transifex 2016-07-26 09:56:20 +02:00
Laurent Destailleur
2af7a8c584 Transifex sync 2016-07-07 10:06:35 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
2223d283dc Sync transifex 2016-06-20 00:45:25 +02:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
 2016-03-10 15:09:30 +01:00
Laurent Destailleur
a61882d847 Sync transifex 2016-03-10 12:44:05 +01:00
Laurent Destailleur
4754ba5683 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/data/llx_10_c_regions.sql
	htdocs/install/mysql/data/llx_20_c_departements.sql
	htdocs/install/mysql/data/llx_c_forme_juridique.sql
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/companies.lang
	htdocs/langs/fr_FR/compta.lang
 2016-02-19 20:17:51 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
71a12824c9 Merge branch 'new_numbering_module_supplier_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:31:33 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-02-06 12:57:30 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Benlo
4aef3d29c1 FIX 4347 : Add labels in translations and change order 2016-01-08 15:03:46 +01:00
Laurent Destailleur
d59f62cd75 Sync transifex 2015-09-30 01:25:35 +02:00
Laurent Destailleur
b4c964760d Sync transifex 2015-09-13 23:25:55 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs 
Sync transifex
 2015-08-31 17:22:36 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list. 
Sync with transifex
 2015-07-15 16:27:01 +02:00
Laurent Destailleur
f06b66c5f0 Sync from transifex 2015-07-03 15:31:51 +02:00
Juanjo Menent
ba97763ac4 Transifex Syncro 2015-06-26 17:40:47 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
ddde869ca4 Sync transifex 2015-04-08 21:35:27 +02:00
Laurent Destailleur
0f51314c7e Sync from transifex 2015-04-02 13:28:20 +02:00
Laurent Destailleur
a8e7d90ea3 Sync transifex 2015-03-13 22:02:53 +01:00
Laurent Destailleur
46b1e213b9 Sync from transifex 2015-02-13 21:26:43 +01:00
Laurent Destailleur
d2398dd1b1 Sync from transifex 2014-12-15 10:31:40 +01:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
Laurent Destailleur
50f690787b Sync transifex 2014-11-09 19:16:41 +01:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
KreizIT
973d61fe13 [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice 2014-08-07 16:23:02 +02:00
Laurent Destailleur
39ce76ba1b Sync from transifex 2014-05-18 12:25:20 +02:00
Laurent Destailleur
dfb81e7997 Sync transifex 2014-05-02 16:52:32 +02:00
Laurent Destailleur
897a9b7446 Sync from transifex. 2014-03-31 19:01:28 +02: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
Alexis Algoud
3a21d99edf Add feature : import line from origin invoice in the new credit note 2014-03-15 12:01:13 +01:00
Laurent Destailleur
492dec0854 Sync from transifex 2014-02-11 23:19:22 +01:00
Laurent Destailleur
e22e4fc4d7 Sync from transifex 2014-02-05 23:10:44 +01:00
Laurent Destailleur
14f85dc8f1 Revert "Sync from transifex" 
This reverts commit 579e7f8e63.
 2013-12-13 17:50:28 +01:00
Laurent Destailleur
579e7f8e63 Sync from transifex 2013-12-09 09:26:48 +01:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
9891e32962 Fix: Removed duplicate entry 2013-09-28 16:50:55 +02:00
simnandez
283d9eb064 Text for invoices numbering modules more clear. Update ChangeLog 2013-08-02 15:27:37 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
simnandez
7efacecb08 New: [ task #1005 ] Adapting to Spanish legislation bill numbering 2013-07-26 12:46:34 +02:00
Laurent Destailleur
a240dba290 Fix: Translation of text 2013-07-18 19:01:19 +02:00
Laurent Destailleur
bd92adf092 Better trans 2013-05-17 11:20:44 +02:00
Grand Philippe
f7f59f962b missing translation for script 2013-05-17 10:35:42 +02:00
fhenry
cae761d522 [ task #640 ] Better deposit invoice management 2013-04-20 17:10:03 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
Marcos García
418921f360 Revert "Revert "Added missing translation"" 
This reverts commit 85866ff9a6.
 2013-04-13 17:14:06 +02:00
Marcos García
85866ff9a6 Revert "Added missing translation" 
This reverts commit 404ad18425.
 2013-04-13 17:10:07 +02:00
Marcos García
404ad18425 Added missing translation 2013-04-13 16:04:51 +02:00
eldy
90025f9c13 Work on revenue stamp 2013-03-23 13:07:25 +01:00
Laurent Destailleur
a47616cb95 Enhance script 2013-03-13 18:27:05 +01:00
Laurent Destailleur
77ca4241a5 New: Can input a payment back onto an credit note. 2012-12-09 18:39:42 +01:00
Laurent Destailleur
6c8b00b82f Fix: Removed duplictae key 2012-11-25 21:00:51 +01:00
Marcos García
952204564f Missing dict translation because of translated key 2012-08-17 23:43:08 +02:00
Laurent Destailleur
9913e87410 New: Add more payment conditions 2012-05-05 02:56:38 +02:00
Regis Houssin
fdd7b71417 Fix: trad 2012-03-14 09:21:05 +01:00
Laurent Destailleur
8b3de5ecf6 Better label 2011-11-16 23:25:41 +01:00
Laurent Destailleur
bf9c482f8a Fix: Deposits was not included into lines but into into remain to pay 2011-11-16 18:58:11 +01:00
Laurent Destailleur
12963265d7 Add confirm message when going back to draft 2011-11-14 16:23:59 +01:00
eldy
c43c2734fb Fix: TVA Non Perçue Récupérable 2011-10-09 17:37:27 +02:00
Laurent Destailleur
605355c89c Fix: When creating invoice from other object, discount are created 
automatically
 2011-09-10 17:52:21 +00:00
Regis Houssin
894ce11c8e mutualise translation 2011-08-24 22:44:56 +00:00
Laurent Destailleur
7b809e11ae Fix: Do not close automatically deposits 2011-08-08 00:44:51 +00:00
Regis Houssin
df3625d498 Works on paypal module 
Fix: add linked objects
 2011-05-24 07:29:14 +00:00
Laurent Destailleur
aa9566163a Trad 2011-05-12 22:48:51 +00:00
Philippe Grand
51059bf52b trad 2011-05-06 07:50:55 +00:00
Laurent Destailleur
1a3c45faea New: task #10969 : Add checkbox to close automatically invoice to "payed" 2011-03-19 13:59:04 +00:00
Laurent Destailleur
b0aec503ff Qual: Clean language files 2011-03-19 12:45:38 +00:00
Laurent Destailleur
2cd2f001cf New: Can add a discount directly when building invoice 2011-02-19 13:23:49 +00:00
Laurent Destailleur
87f2b821de New: Can add a discount directly when building invoice 2011-02-19 12:15:17 +00:00