Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,922 Commits 36 Branches 190 Tags
a6233a738c2f67e557b54b144066a7cb15c728e8
Commit Graph

699 Commits

Author SHA1 Message Date
Laurent Destailleur
7260f39d21 New: Support tag total_vat_x.y for vat rate x.y into ODT templates 2013-02-15 17:06:32 +01:00
Laurent Destailleur
7d1c51ab77 Add option MAIN_PDF_TITLE_BACKGROUND_COLOR 2013-02-13 16:45:53 +01:00
Laurent Destailleur
f4c4a43f57 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-28 17:31:17 +01:00
Laurent Destailleur
ac3ccade98 Fix: number of chars to low to show value. 2013-01-28 13:11:12 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
f650888ea6 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-18 12:17:21 +01:00
Laurent Destailleur
7c826dc38d Fix: Bad error management 2013-01-18 12:09:39 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
6a51db82e9 Qual: We can enable box by default because a warning is output to user. 2013-01-15 15:53:35 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
8ac33e98e7 Fix: property object_total_discount was not working when quantity was 
not 1.
 2013-01-10 12:58:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
5c51905f63 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
f3df7a2fec Fix: An easier to understand fix. Remove also not recommanded "continue 
2" instructions.
 2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c Merge pull request #581 from simnandez/3.3 
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
 2013-01-08 13:38:38 -08:00
Laurent Destailleur
b7a5e226c9 Fix: Disable menu entry of a not avilable feature 2013-01-08 18:53:45 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
simnandez
596df78d39 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-08 08:46:48 +01:00
Laurent Destailleur
de83dc68e1 New: Uniformize odt generation to use hooks like pdf generation 2013-01-07 02:24:20 +01:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
717657dd05 Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO 2012-12-30 12:40:32 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Marcos García
354c00b9ca CerfaFR donation template wasn't translating payment mode 2012-12-29 01:13:31 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression. 
Include an option to support local tax of type 7 (need more time to
validate this type).
 2012-12-19 18:51:49 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Laurent Destailleur
57742b347a Fix: Bad position of field with non A4 pages 2012-12-12 20:58:49 +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
b119ab5539 Prepare 3.3 freeze. 2012-12-08 14:24:57 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes 
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
 2012-12-05 11:18:45 +01:00
Laurent Destailleur
b0b0f06655 Fix: Removed useless code 2012-12-03 20:23:16 +01:00
Regis Houssin
4388be7295 FIXME $ident is not defined 2012-12-03 17:16:04 +01:00
Laurent Destailleur
7d8c0837b6 Restore another lost commit. 2012-12-02 19:45:35 +01:00
Laurent Destailleur
fd22705de4 New: Log handler can now manage indent on database transactions 2012-12-02 15:20:45 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18 function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-12-02 10:52:53 +01:00
Christophe Battarel
785491ca2c add function gettypeoflocaltax and modify pdf models 2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b remove unused arrays into pdf models (localtaxes) 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php

Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
 2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a show local taxes on crabe pdf model 2012-12-02 10:42:24 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Christophe Battarel
b70df3762c Merge branch 'develop' of https://github.com/cbattarel/dolibarr into develop 2012-11-30 10:58:57 +01:00
Christophe Battarel
04718b1832 resolve conflict 2012-11-30 10:57:42 +01:00
Christophe Battarel
51d87f8f4a function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-11-29 11:36:59 +01:00
Regis Houssin
d97f1937f8 Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!! 2012-11-29 10:25:33 +01:00