Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

215 Commits

Author SHA1 Message Date
Laurent Destailleur
50f690787b Sync transifex 2014-11-09 19:16:41 +01:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Alexis Algoud
691658cde3 add the clone action for a social contribution 
- With option to clone it to the next month by default
 2014-09-23 16:52:15 +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
Juanjo Menent
2564413a70 Fix: Translation 2014-07-17 11:44:10 +02:00
Juanjo Menent
74b42f6cb4 [ task #1063 ] Allow edit localtaxes rate for thirds 2014-07-04 17:31:34 +02:00
Juanjo Menent
2ca01741ac [ task #1063 ] Allow edit localtaxes rate for thirds. Language 2014-07-04 17:17:35 +02:00
aspangaro
5cc8ec4f5f Add accountancy code journal into bank card & modify presentation 2014-06-29 20:10:43 +02:00
Laurent Destailleur
0058bea8e0 Fix typo 2014-04-23 10:22:03 +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
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
fca29f4312 Add table into script migration && key language 2014-03-06 21:29:20 +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
Marcos García de La Fuente
2a41a29306 Fixed bad translation 2014-01-06 06:05:30 +01:00
Laurent Destailleur
9a07f31a8c Doxygen 
Bad translation
 2013-12-13 17:36:43 +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
Laurent Destailleur
f3d7f87025 Fix: Translation 2013-10-23 23:13:32 +02:00
Laurent Destailleur
086eb125bf Qual: Removed no more required translation entry UTF8 2013-10-23 10:34:48 +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
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
Maxime Kohlhaas
7abc53698a Add RefExt field on RemiseCheque 2013-07-19 08:54:11 +02:00
Laurent Destailleur
d8cef10ea3 Make comment generic for all files 2013-05-27 10:38:50 +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
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +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
Laurent Destailleur
9c13f81bef Trans 2012-08-31 18:38:01 +02:00
Spangaro Alexandre
9050431f87 Simply way to update chart of accounts 2012-08-26 17:11:19 +02:00
Laurent Destailleur
77870d0557 Add hidden option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS 2012-01-08 23:43:32 +01:00
Laurent Destailleur
d46241e380 Fix: Translations 2011-10-29 20:00:21 +02:00
Juanjo Menent
ed3059d370 New: [task #219] LocalTaxes: Add taxes and dividends 2011-10-28 12:17:53 +02:00
Laurent Destailleur
0426a4c441 Trans 2011-09-14 12:35:16 +00: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
b63629067f Typo 2011-01-19 09:21:48 +00:00
Laurent Destailleur
56b29ee004 Fix: Exclude deposit invoices from turnover reports 2010-12-28 23:52:16 +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
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