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

207 Commits

Author SHA1 Message Date
Laurent Destailleur
2223d283dc Sync transifex 2016-06-20 00:45:25 +02:00
Laurent Destailleur
a61882d847 Sync transifex 2016-03-10 12:44:05 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
Laurent Destailleur
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
Laurent Destailleur
c20296f963 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-10-04 20:46:17 +02:00
Laurent Destailleur
4201e8b032 FIX #3630 - Wrong balance report when module salaries and donation 
disabled
 2015-10-01 14:38:31 +02: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
4567f56980 Sync from transifex 2015-07-30 17:09:18 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +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
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +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
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
219cd0f855 Fixed: Translation 2014-12-20 15:52:50 +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
8a98f8461d Sync transifex 2014-10-11 14:33:22 +02:00
Laurent Destailleur
a19e8aa89d Sync transifex 2014-10-09 17:15:15 +02:00
Laurent Destailleur
e35135d5b1 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql
 2014-09-29 16:31:35 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
aspangaro
ab9226aab6 Delete elements have a link with old module ventilation - Replace today by module Accounting Expert 2014-09-19 05:55:54 +02:00
Laurent Destailleur
17f1638ec2 Sync from transifex 2014-09-15 09:11:16 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02: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
aspangaro
12ffb19cec Use more explicit name for class and functions 2014-03-11 06:26:18 +01:00
aspangaro
74d3fdae15 Update langs & fix period for salaries in tax module 2014-03-07 06:42:48 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
9cf745b127 Sync with transifex 2014-01-26 23:12:25 +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
Grand Philippe
e8e5f4d943 missing trad 2013-11-25 13:55:01 +01:00
Grand Philippe
08e44135bf add missing trad 2013-11-24 14:47:44 +01:00
Grand Philippe
46366154ef fix language 2013-11-06 17:08:50 +01:00
Laurent Destailleur
66e941d0c1 Fix: Some translation were lost 2013-10-25 11:22:56 +02:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Laurent Destailleur
af521ec070 Trans: Missing translation for accountancy module 2013-10-19 00:33:37 +02:00
Laurent Destailleur
303cad162b Qual: Show the rule name used to make calculation and link to change 
rule.
 2013-10-10 19:33:49 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
aspangaro
91320ef99c Update translation fr_FR 2013-09-04 05:17:33 +02:00
Laurent Destailleur
3bfaadc054 Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
lalaina rasamoelina
f913422e62 T999-develop: link invoice to a command 
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
 2013-08-22 10:17:03 +02:00
Laurent Destailleur
7438809ab5 Make predefined invoice feature easier to use. 2013-08-06 23:55:17 +02:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
Maxime Kohlhaas
7abc53698a Add RefExt field on RemiseCheque 2013-07-19 08:54:11 +02:00
Laurent Destailleur
3a11e0baad New: Script export-bank-receipts should be ready for test. 2013-05-14 23:59:59 +02:00
Raphaël Doursenaud
f2bd1461b2 Improved reports 
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
 2013-04-20 07:33:10 +02:00
Laurent Destailleur
22402c38f8 Still working on new menu management. 2013-04-14 14:32:38 +02:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +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
b160b97cbe New: Add warning message. 2012-10-17 14:23:56 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +02:00
Spangaro Alexandre
62322b3bda Better translation 2012-08-26 17:24:49 +02:00
Spangaro Alexandre
9050431f87 Simply way to update chart of accounts 2012-08-26 17:11:19 +02:00
Raphaël Doursenaud
bba9aa4bb4 French spelling 
Chiffre d'affaire -> Chiffre d'affaires
 2012-07-19 19:32:57 +02:00
Laurent Destailleur
c1600bc4fa Minor fix 2012-02-10 09:16:38 +01:00
Laurent Destailleur
77870d0557 Add hidden option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS 2012-01-08 23:43:32 +01:00
Juanjo Menent
ed3059d370 New: [task #219] LocalTaxes: Add taxes and dividends 2011-10-28 12:17:53 +02:00
Cyrille de Lambert
26e315c785 improves the simplified payment 
MAIN_JS_ON_PAYMENT must be set
 2011-07-27 08:00:45 +00:00
Laurent Destailleur
cec23023d1 Fix: Several fix in vat calculation. Add warning to say deposit invoices are not included. 2011-07-18 11:11:19 +00:00
Juanjo Menent
f9a57d99bf Fix: Missing translation 2011-07-11 08:38:02 +00:00
Laurent Destailleur
d0a3ba0e07 Fix: Use correct date 2011-06-14 22:28:10 +00:00
Laurent Destailleur
78df91cd23 Try to add a patch but keep it with a condition because of several problems. 2011-05-18 19:28:01 +00:00
Laurent Destailleur
56b29ee004 Fix: Exclude deposit invoices from turnover reports 2010-12-28 23:52:16 +00:00
Laurent Destailleur
9aaf440b0d Fix: Lot of fix in journal 2010-12-15 01:13:06 +00:00
Laurent Destailleur
9645372f3d Fix: Debug in journal features 2010-12-06 02:25:13 +00:00
Laurent Destailleur
714ce334b6 Fix: Debug in journal features 2010-12-06 02:25:13 +00:00
tiaris
801ebb4e2a New : Acountancy reports for clients and suppliers invoices 2010-12-04 14:54:29 +00:00
Laurent Destailleur
d7ed04bf31 New: Add 4 constants TAX_MODE_SELL/BUY_PRODUCT/SERVICE to define rule to calculate VAT. 2010-09-29 18:53:49 +00:00
Laurent Destailleur
003caa7063 Qual: Better organisation of tax module menus to match other modules 2010-03-17 19:26:54 +00:00
Philippe Grand
ba5de65c0c Some spelling changes 2010-03-15 09:11:59 +00:00
Philippe Grand
ec3031fa8d some spelling changes 2010-03-14 17:22:56 +00:00
Regis Houssin
7906b63597 Fix: corrections orthographique par Grandoc 2010-03-12 08:41:56 +00:00
Laurent Destailleur
808e54edfc Reports is more clear. 2010-02-14 19:38:20 +00:00
Laurent Destailleur
e20e67968d Fix: Misc fix. Bad links. Missing label. 2010-02-14 12:42:00 +00:00
Laurent Destailleur
a8a2f50d07 First change to enhance VAT reports 2010-01-12 10:02:02 +00:00
Laurent Destailleur
6d8a09fd74 First change to enhance VAT reports 2010-01-11 23:25:54 +00:00
Laurent Destailleur
c2699317ca Trad 2009-08-27 17:55:01 +00:00
Laurent Destailleur
9c53f0ed8e Fix: Fix global typo error 2009-08-19 17:16:47 +00:00
Laurent Destailleur
eb6d4e2b99 Trad 2009-07-29 16:29:02 +00:00
Regis Houssin
41ca952b8d Fix: traduction 2009-04-16 14:24:20 +00:00
Laurent Destailleur
33ff5c61f2 Minor enhancement on vat report 2009-03-05 20:14:13 +00:00
Juanjo Menent
19371d1725 Improve translations. Left menu Chiffre d'affaire 2009-02-25 08:46:56 +00:00
Laurent Destailleur
40bff7f636 Update text 2009-02-01 03:48:47 +00:00
Laurent Destailleur
fd2782edc8 Convert iso files to utf 2009-01-22 01:00:42 +00:00
Laurent Destailleur
e23bb856c7 Update charset in language files. 2009-01-19 19:43:16 +00:00
Laurent Destailleur
c7569e6316 New: Added a link to vat payment on bank transaction view for vat payment. 2008-11-16 22:26:47 +00:00
Laurent Destailleur
b6a95136cd Translation 2008-11-15 21:35:01 +00:00
Laurent Destailleur
1091f72a8f Library functions must be in lib directory 2008-11-15 21:10:10 +00:00
Laurent Destailleur
8411203632 Add patch from patrick raguin to support minimum for a price 2008-08-27 23:00:37 +00:00
Laurent Destailleur
a83964bb7f Lang: Translation more clear 2008-08-07 06:58:42 +00:00
Laurent Destailleur
efb83920ee Lang: Removed duplicate string 2008-08-07 06:49:43 +00:00
Laurent Destailleur
084a12627f Lang: Removed duplicate string 2008-08-07 06:49:43 +00:00
Laurent Destailleur
fefd9d066e Suite rapport TVA 2008-02-18 12:25:21 +00:00