lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,633 Commits 43 Branches 150 Tags 886 MiB
2e81fa342e
Commit Graph

681 Commits

Author SHA1 Message Date
Grand Philippe
86dff79b73 try to fix : cannot display numbering models 2013-03-16 16:58:45 +01:00
Grand Philippe
7a69066dc8 enhancement of suppliers module 2013-03-16 15:24:14 +01:00
Grand Philippe
cdb521663e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-16 10:35:12 +01:00
fhenry
98cc7b7a2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-16 09:43:57 +01:00
fhenry
e71103ed02 task #768: 
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
 2013-03-16 09:23:34 +01:00
jfefe
65a9edd5a7 Fix : lang 2013-03-16 01:52:56 +01:00
jfefe
5f1141675c Add constants into config of ODT document for propal : can choose wich ODT will be used on creation and when close to bill or not. 2013-03-16 01:10:21 +01:00
Grand Philippe
7dbc782d42 prepair numbering models for supplier invoices 2013-03-15 19:03:07 +01:00
Grand Philippe
e46900ad84 prepair numbering models for supplier invoices 2013-03-15 18:40:31 +01:00
Grand Philippe
8f7c629d9c prepair numbering models for supplier invoices 2013-03-15 17:45:25 +01:00
Laurent Destailleur
7a152c8e0b Prepare code to be compatible when we will store localtax_type into 
lines.
 2013-03-15 17:29:18 +01:00
Laurent Destailleur
f522b18bdc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-15 17:14:06 +01:00
Laurent Destailleur
2ab28d974f Fix: Use better test to show localtax to avoid problem when switching 
from different country.
Perf: Can return all localtaxes in one call.
 2013-03-15 17:10:18 +01:00
Laurent Destailleur
1a62cdfbe8 Fix: Use better test to show localtax to avoid problem when switching 
from different country.
 2013-03-15 17:06:42 +01:00
Grand Philippe
a9eed57e27 prepair numbering models for supplier invoices 2013-03-15 16:43:28 +01:00
Grand Philippe
b0bce23595 prepair numbering models for supplier invoices 2013-03-15 16:16:38 +01:00
Grand Philippe
3c7c5f262f anglicization of comments 2013-03-15 16:03:03 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
Laurent Destailleur
277784af25 New: Start to work on a cron module 2013-03-13 19:55:21 +01:00
Laurent Destailleur
b0d7b33815 Merge pull request #715 from jfefe/extrafields 
[ task #746 ] add extrafields support on propal object
 2013-03-11 08:44:59 -07:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Laurent Destailleur
5eb728ae43 Fix: Usage of order into export broken when filters are used 2013-03-11 14:09:54 +01:00
jfefe
ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields 
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
60f16e1a88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-09 19:06:53 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
e03487f865 Merge pull request #724 from KreizIT/develop 
Add trigger BILL_UNVALIDATE when invoice is unvalidate
 2013-03-09 09:55:29 -08:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
00f4e6ad85 Fix: Force format text of excel text fields 2013-03-09 16:58:55 +01:00
Laurent Destailleur
418eeef8b4 Fix: Ton of bugs into renaming fields 2013-03-09 16:19:15 +01:00
frederic34
16c5427366 Print IPP 2013-03-08 11:26:05 +01:00
Laurent Destailleur
c86f3ef4b4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2013-03-08 01:57:32 +01:00
Laurent Destailleur
e97ca67c4a Fix: Several problem with localtax into PDF generation 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2013-03-07 19:13:50 +01:00
Laurent Destailleur
c762c93eb1 Fix: Several problem with localtax into PDF generation 2013-03-07 12:04:12 +01:00
jfefe
fcd81e47eb Use price2num() function instead of price() to use calcul in ODT. 
Libre/Open Office wants number with dot and no space to allow make calcul in ODT document
 2013-03-07 03:43:23 +01:00
jfefe
289e2e7888 New function to fill ODT substitution array with extrafield of object 2013-03-07 03:27:28 +01:00
jfefe
1690c77aa2 Merge branch 'extra_invoice' into extrafields 
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-07 01:48:27 +01:00
eldy
6c2841d4d6 New: Type of fields are received by export format handlers 2013-03-06 22:28:15 +01:00
eldy
e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-06 21:28:50 +01:00
jfefe
04617d0eb3 Show extrafields for object into invoice ODT document 2013-03-06 05:33:00 +01:00
jfefe
7d3c35fb90 Merge branch 'extra_propal' into extrafields 2013-03-06 01:41:47 +01:00
Laurent Destailleur
c37e873ab4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
 2013-03-05 18:32:01 +01:00
jfefe
5ce11d00dd Display linked propal information into invoice ODT 2013-03-05 15:11:51 +01:00
JF FERRY
ff2a851ae8 Move substitution function for propal to common class & add extrafields display 2013-03-05 08:38:41 +01:00
Laurent Destailleur
b036120c70 Labels 2013-03-04 23:56:17 +01:00
fhenry
c29602382d Taking account remark on pull request da17302 2013-03-04 16:59:39 +01:00
fhenry
da17302349 [ task #743 ] GED : Add aministration option to disabled autotree to 
display
 2013-03-04 11:16:46 +01:00
fhenry
b0212fc8e6 Fix [ bug #742 ] 
and translation of constant description
 2013-03-03 21:23:18 +01:00
Laurent Destailleur
7bbbda2dce New: dol_syslog method accept a suffix to use different log files for 
log.
 2013-02-28 16:19:16 +01:00
Laurent Destailleur
bdcb6bdef5 Try to aplpy enhancements defined into 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
 2013-02-26 20:15:20 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082 english language standardization 2013-02-23 17:01:10 +01:00
Laurent Destailleur
4dbf5a20ad Merge pull request #687 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 07:38:55 -08:00
Grand Philippe
ac0e99bc1a english language standardization 2013-02-23 16:21:49 +01:00
Grand Philippe
f862adc4d9 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 15:27:06 +01:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
Grand Philippe
7c2a4500d6 fix: change name with lastname 2013-02-23 12:30:01 +01:00
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 03:11:52 -08:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Grand Philippe
a0df6764d8 english standardization 2013-02-22 17:13:11 +01:00
Grand Philippe
844433d0a2 english standardization 2013-02-22 17:11:53 +01:00
Laurent Destailleur
8c4e13230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 14:20:46 +01:00
philippe
b4e43bbc41 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:58:19 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Regis Houssin
7d0f02eb8b Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:04 +01:00
Laurent Destailleur
a1b05f8be4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:02:15 +01:00
Regis Houssin
8a5f68de9c Fix: wrong hidden 2013-02-22 12:22:28 +01:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00
Laurent Destailleur
327f4062c7 New: Prepare code to be able to choose bank account to show when 
building pdf and payment mode is withdraw.
 2013-02-22 12:04:38 +01:00
philippe
fae9f73ea4 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 11:31:52 +01:00
Regis Houssin
3b45cffafa Fix: hide blocs with multi-page 2013-02-22 11:26:23 +01:00
Regis Houssin
8136244d87 Fix: hide blocs with multi-page 2013-02-22 11:25:29 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
frederic34
de4bc7f39d Fix : It was a bad idea to add COL in the code name of new carriers 2013-02-22 08:56:14 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +01:00
fhenry
3e42f90b1e Better to use foreach because when add mail in $cible array we can test 
with (!array_key_exists($obj->email, $cibles)) better than old method
 2013-02-19 04:48:39 +01:00
Laurent Destailleur
2ea62073b6 Merge pull request #660 from grandoc/develop 
fix : doesn't work with a /
 2013-02-16 14:14:30 -08:00
Grand Philippe
2bfd6c40d0 fix trad : change adresse versus address 2013-02-15 19:26:09 +01:00
Grand Philippe
7c47dedbce fix trad: begin change address instead of adresse 2013-02-15 17:33:07 +01:00
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
Laurent Destailleur
8212700c41 Fix: EOL 2012-11-28 19:25:12 +01:00
Laurent Destailleur
effe169850 Fix: pdf_getPDFFontSize must be after pdf_getInstance 2012-11-28 19:19:39 +01:00
Christophe Battarel
e459736977 add function gettypeoflocaltax and modify pdf models 2012-11-28 17:47:15 +01:00
Christophe Battarel
f0918a2536 remove unused arrays into pdf models (localtaxes) 2012-11-28 12:13:03 +01:00
Christophe Battarel
1e8aae4de4 show local taxes on crabe pdf model 2012-11-28 12:11:42 +01:00
Christophe Battarel
b9cdde88c7 show localtaxes on einstein pdf model 2012-11-28 10:43:21 +01:00
Christophe Battarel
f00b4b5527 correction to allow global local tax (type 7) on localtax1 2012-11-28 10:24:40 +01:00
Christophe Battarel
203a03c4d1 show local taxes on pdf propale azur model 2012-11-27 15:56:45 +01:00
Laurent Destailleur
59a305f6f1 New: no dash line if last item. 2012-11-21 20:35:51 +01:00
Laurent Destailleur
1f263943c5 New: Add option to add slashes lines between lines into PDF. 2012-11-21 19:07:03 +01:00
Laurent Destailleur
d9cdb542d5 Debug filter during export 2012-11-20 14:07:52 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Laurent Destailleur
2e8e1f759f New: Add warning when we try to load sql from an not existing dir 2012-11-16 13:25:49 +01:00
Laurent Destailleur
511a75b5de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 18:59:07 +01:00
Laurent Destailleur
768e719961 Fix: firstname was missing 2012-11-14 18:32:52 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Laurent Destailleur
5e583b65f2 Doxygen 2012-11-14 01:35:39 +01:00