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

33267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ef00d592e7 Fix: Backward compatibility with spain. 2012-09-11 01:42:50 +02:00
Laurent Destailleur
e68f861923 New: Add more test and enhancement to make new calcul_price function 
more reliable. We need to add more PHPUnit test case on this function
(testcase using localtax1 and localtax2).
 2012-09-11 01:09:34 +02:00
Laurent Destailleur
b6239427f6 Merge pull request #382 from cbattarel/localtax 
calculate prices with generic local taxes management
 2012-09-10 14:36:44 -07:00
Laurent Destailleur
6159e71427 Merge pull request #384 from marcosgdf/task-539 
Better practice
 2012-09-10 14:32:42 -07:00
Marcos García
62b7ba607d Better practice 
Replaced `empty($conf->global->MAIN_MODULE_BARCODE)` with `empty($conf->barcode->enabled)`
 2012-09-10 23:23:25 +02:00
Laurent Destailleur
3a18633df3 Merge pull request #383 from marcosgdf/task-539 
Task #539 - Add new products into proposals,invoices... with barcode
 2012-09-10 14:04:50 -07:00
Laurent Destailleur
de339278bc Fix: removed warning 2012-09-10 22:59:50 +02:00
Marcos García
ded4e061e1 Typo 2012-09-10 22:59:03 +02:00
Marcos García
61e2596e4d Task #539 - Add new products into proposals,invoices... with barcode 2012-09-10 22:55:12 +02:00
Regis Houssin
de54481129 Merge pull request #381 from marcosgdf/minor 
Translation improvements
 2012-09-10 07:56:37 -07:00
Christophe Battarel
c6da5b79fe change localtaxes parameters to be compatible with older calls 2012-09-10 16:49:36 +02:00
Christophe Battarel
8c11da1df8 readapt to 3.3 2012-09-10 16:01:20 +02:00
Christophe Battarel
4cca760feb calculate prices with generic local taxes management 2012-09-10 15:47:33 +02:00
Marcos García
d7d1c8ac65 Missing paper formats unit translations 2012-09-10 15:14:29 +02:00
Regis Houssin
ba2f986282 Fix: [ bug #537 ] Fatal error: Using $this when not in object context 2012-09-10 14:40:32 +02:00
Regis Houssin
6162d296ce Fix: strict mode cowboy 2012-09-10 14:30:33 +02:00
Marcos García
b92f52cdf9 Social charges deductible field now with yes/no select 2012-09-10 14:12:31 +02:00
Regis Houssin
26ff406e4a Fix: use MODIFY instead CHANGE for just change the type of field 2012-09-10 13:25:34 +02:00
Regis Houssin
e9c72f812d Merge pull request #380 from marcosgdf/minor 
Modified llx_menu sql and improved add menu form
 2012-09-10 04:18:31 -07:00
Marcos García
74b28dab79 Merge branch 'develop' into minor 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-09-10 12:16:45 +02:00
Regis Houssin
9188a24c78 Merge pull request #379 from marcosgdf/translations 
Improved translations
 2012-09-10 03:07:07 -07:00
Regis Houssin
83179fc4f0 Merge pull request #378 from cbattarel/localtax 
prepare database for local taxes management (2nd try) - task 204 on doliforge
 2012-09-10 03:04:31 -07:00
Regis Houssin
4269878e6d Fix: restore varchar for the moment 2012-09-10 11:59:17 +02:00
Marcos García
f0803a7713 Improved es_ES translations 2012-09-10 11:15:54 +02:00
Christophe Battarel
2e4aa1131a prepare database for local taxes management 
add localtax1_type and localtax2_type in database.
these type are char(1) and support following values :
'0' : local tax not applied
'1' : local tax apply on products and services without vat (vat is not applied on local tax)
'2' : local tax apply on products and services before vat (vat is calculated on amount + localtax)
'3' : local tax apply on products without vat (vat is not applied on local tax)
'4' : local tax apply on products before vat (vat is calculated on amount + localtax)
'5' : local tax apply on services without vat (vat is not applied on local tax)
'6' : local tax apply on services before vat (vat is calculated on amount + localtax)
'7' : local tax is a fix amount applied on global invoice
 2012-09-10 11:00:35 +02:00
Regis Houssin
e1fcaf738f Fix: move llx_ecm_documents in external module 2012-09-10 10:55:06 +02:00
Laurent Destailleur
66af48697c Doc 2012-09-10 10:25:47 +02:00
Laurent Destailleur
1a746ad99b Merge pull request #377 from GPCsolutions/societe_commercial 
Inverted the clause for commercial_id affectation
 2012-09-10 01:21:38 -07:00
Raphaël Doursenaud
75647aa19d Inverted the clause for commercial_id affectation 
This permits using a script to import commercial_id.
The clause to automatically affect the current user as commercial doesn't seem to work anyway
 2012-09-10 10:00:22 +02:00
Laurent Destailleur
3335bf629b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-10 09:47:11 +02:00
Laurent Destailleur
1d341caffd Merge pull request #376 from simnandez/develop 
Fix: use $ldap instead $this
 2012-09-10 00:46:35 -07:00
simnandez
f390bec1ac Fix: use $ldap instead $this 2012-09-10 09:06:37 +02:00
Marcos García
45cd500882 Modified llx_menu sql and improved new menu form 
Modified `enabled` field to tinyint(1) because only holds 0 or 1
Enabled input field now made yes/no select
 2012-09-10 02:09:52 +02:00
Marcos García
5536fecc3b Missing translations & improved es_ES translations 2012-09-10 01:15:57 +02:00
Regis Houssin
61159ca220 Fix: use specific hash for ref 2012-09-09 22:05:53 +02:00
Laurent Destailleur
3b3e67758e Fix: Removed warnings 2012-09-09 20:33:00 +02:00
Regis Houssin
5ff1240287 Fix: increase size for big path and where data is encrypted 2012-09-09 18:28:36 +02:00
Regis Houssin
d7f3deffce Fix: convert line delimiters 2012-09-09 16:32:03 +02:00
Regis Houssin
a7bfc722d5 Fix: use specific variable 2012-09-09 16:31:00 +02:00
Regis Houssin
9058439015 Fix: best practice 2012-09-09 16:17:19 +02:00
Laurent Destailleur
1450ee1978 Merge pull request #375 from marcosgdf/barcode-mini-search 
Added Copyright and changelog entry
 2012-09-09 06:34:26 -07:00
Laurent Destailleur
2cfb0428bc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-09 15:24:34 +02:00
Laurent Destailleur
83cdb2167e Fix: Use bad parameter name 2012-09-09 15:23:09 +02:00
Marcos García
94090e85db Added Copyright and changelog entry 2012-09-09 15:12:04 +02:00
Laurent Destailleur
3ab88a1171 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-09 15:10:15 +02:00
Laurent Destailleur
fcce22026a Fix: Bad name of var 2012-09-09 15:09:54 +02:00
Laurent Destailleur
8f20d31b4f Merge pull request #374 from marcosgdf/barcode-mini-search 
Allow to search barcodes in the permanent mini search box
 2012-09-09 06:04:20 -07:00
Laurent Destailleur
e0624abb2c Added option THEME_ELDY_USE_HOVER to enable mouse hover, because when 
using software a lot, it becomes annoying. So we let user choose
(choice possible only with eldy theme for the moment).
 2012-09-09 14:49:20 +02:00
Marcos García
33c1fd2a01 Allow to search barcodes in the permanent mini search box 
Requested by Joaquim in Dolibarr.es forum
http://dolibarr.es/index.php/foro/9-sugerencias/1337-buscador-de-la-izquierda/
 2012-09-09 14:43:41 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00