Grand Philippe
57d20e28fb
normalize and simplify code
2013-03-17 12:56:54 +01:00
Grand Philippe
88256b7531
normalize
2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-17 10:03:29 +01:00
Grand Philippe
d2c10159fe
try to fix : cannot display numbering models
2013-03-16 17:10:24 +01:00
Laurent Destailleur
33a7692fbc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
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/exports/class/export.class.php
2013-03-16 17:07:35 +01:00
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
Laurent Destailleur
06c77576b7
New: Maxi debug on feature to filter lines on export. Removed a lot of
...
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
2012-11-14 00:27:25 +01:00
Laurent Destailleur
66755fb166
Fix: Avoid confusion between method getXXX into parent class with
...
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
2012-11-11 18:11:10 +01:00
Laurent Destailleur
842982f134
Doxygen
2012-11-11 17:50:24 +01:00
Laurent Destailleur
7d01ea7fc3
Fix: Do not break dolibarr usage if log fails
2012-11-06 19:42:03 +01:00
Laurent Destailleur
8896803921
New: We can use a dynamic value ($conf->global->XXX for example) into
...
titles of menus.
New: Can choose menu entry to show with external site module.
2012-11-04 21:19:12 +01:00
Laurent Destailleur
19c617e4a0
Fix: Solve double ";;"
2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0
Fix: Not enought space for free text. To avoid to edit again and again
...
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
2012-11-03 13:32:37 +01:00
Laurent Destailleur
f8a9733b73
Again 2 pixels missings
2012-11-03 00:37:10 +01:00
Laurent Destailleur
5f3ceb0081
Fix: Label for payment by cheque using the wrong translation key
...
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
2012-11-02 15:41:09 +01:00
Laurent Destailleur
fd7aea9779
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-31 15:21:38 +01:00
Laurent Destailleur
18e5f8dea6
Fix: Bad detection of space left
2012-10-31 15:21:21 +01:00
Laurent Destailleur
b619437377
Merge pull request #469 from camlafit/develop
...
Return Human readable date product
2012-10-31 07:13:46 -07:00
Laurent Destailleur
13ef8491b7
Fix: Error management
2012-10-31 15:09:42 +01:00
Laurent Destailleur
68bf51c8dd
Qual: Uniformize PDF code
2012-10-31 14:55:35 +01:00
cam.lafit
a3f0ce9063
Merge all substitutions on same loop (Invoicing with odt)
...
* It's not necessary to have a redondant loop to substitute all variables
2012-10-31 14:49:27 +01:00
cam.lafit
7b8b015569
Return Human readable date product
...
* By default date with mktime format, not great on Invoice
2012-10-31 14:49:27 +01:00
Laurent Destailleur
f6d9b2abe3
New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT,
...
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
2012-10-31 13:48:59 +01:00
Laurent Destailleur
dbfe71922e
Fix: Avoid warnings
2012-10-31 12:35:52 +01:00
Maxime Kohlhaas
240d310a7f
Fix : shipment PDF rouget wasn't using the right var to access related internal contact
2012-10-31 08:57:56 +01:00
Laurent Destailleur
64d8d558a5
Qual: Uniformize pdf code
2012-10-31 02:29:45 +01:00
Laurent Destailleur
42d2a0a2d1
Fix: Bad position of columns. Works with all paper format now.
2012-10-30 19:24:31 +01:00
Laurent Destailleur
08724f5ec0
Qual: Some changes to use more efficiently bottom of page when there is
...
several pages (we don't keep space for total on all pages, but only last
one)
2012-10-30 18:26:04 +01:00
Laurent Destailleur
54852e29e7
Qual: Removed duplicate template (nearly no difference between sirroco
...
and typhon, so no need to keep them both).
2012-10-30 17:59:16 +01:00
Laurent Destailleur
ea90571925
Fix: The bottom margin is already included into heightforfooter
...
This provide 1cm more for product description.
2012-10-30 17:57:32 +01:00
Laurent Destailleur
6f9c9fcd55
Fix: Free text overlap data when not on last page.
2012-10-30 13:11:17 +01:00
Laurent Destailleur
e013fa01a7
Fix: Revert direction of option (this information is a legal issue for
...
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
2012-10-29 11:38:32 +01:00
Laurent Destailleur
9d4471dd67
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
2012-10-28 19:53:14 +01:00
Laurent Destailleur
3738d3e6be
Fix: Better fix for import when field is computed by a function
2012-10-28 18:57:30 +01:00
Regis Houssin
b952a7f9bf
Fix: convert line delimiters (use the last eclipse version)
2012-10-28 13:57:21 +01:00
Laurent Destailleur
ee29c65708
Move stock import into stock module (stock module is at a low level than
...
product)
2012-10-27 20:27:07 +02:00
Christophe Battarel
253e3412db
fix wrong insert sql construction
...
field type detection was made before optional conversions so it might be wrong; i replaced it with a more simple solution
2012-10-27 12:55:28 +02:00
simnandez
9ada60afbc
New: More import options. Products categories
2012-10-26 18:53:56 +02:00
simnandez
3821bf8c66
New: More import options. Products categories
2012-10-26 18:43:34 +02:00
simnandez
9a05bc8e83
New: More import options. Products categories
2012-10-26 18:38:34 +02:00
simnandez
d4df585e3c
New: More import options. Customer and suppliers categories
2012-10-26 18:34:49 +02:00
simnandez
425ebae802
New: More import options. Products categories
2012-10-26 18:19:04 +02:00
simnandez
7aec227694
New: More import options. Products stocks
2012-10-26 17:52:53 +02:00
simnandez
970933ec7f
Fix: [ bug #579 ] Multi-Company and imports
2012-10-26 17:29:41 +02:00
Regis Houssin
c521a77e92
New: add key generator in webservices admin page
2012-10-26 15:20:47 +02:00
Regis Houssin
b5d70ad17f
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1
New: add export filters (thank you Charles Benke)
2012-10-25 22:30:17 +02:00
simnandez
e89a06bb9c
Fix: Bad ProfId assignation in imports
2012-10-25 17:08:25 +02:00
Laurent Destailleur
daeb1029a1
New: Support field required or not
2012-10-25 13:11:55 +02:00
Regis Houssin
9d95e8bffb
Fix: missing hookmanager
2012-10-25 11:44:04 +02:00
Regis Houssin
f8f1d3a0df
Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement
...
mode and paiement method in pdf
2012-10-25 09:24:05 +02:00
Regis Houssin
23707e2346
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0
Fix: strict mode
2012-10-24 22:50:19 +02:00
Laurent Destailleur
d1a4a6a090
New: Support synchro of field job/title.
...
New: Add script to synchronize users from ldap to dolibarr.
2012-10-24 21:19:10 +02:00
Laurent Destailleur
eaad5f075e
Fix: Some fix to removed refused controls by distrib package build
...
systems.
2012-10-22 13:08:55 +02:00
Laurent Destailleur
d56791d4dc
Fix: Works with PHP 5.2
2012-10-22 00:43:59 +02:00
Laurent Destailleur
bba5057d5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-21 15:51:03 +02:00
Laurent Destailleur
fbb3ce63a7
Fix: PDF works with US executive format.
2012-10-21 15:50:53 +02:00
simnandez
aa53b7a2ba
New: More import options. Thirds Bank Accounts
2012-10-19 13:00:53 +02:00
Laurent Destailleur
0152e226c1
Fix: Use correct translation of fields
2012-10-18 13:25:32 +02:00
Laurent Destailleur
82e0462dc8
Merge pull request #453 from simnandez/develop
...
New: More import options. Categories Trad: Add es_ES and ca_ES missing translations
2012-10-18 03:31:55 -07:00
Regis Houssin
d705995a49
Fix: convert line delimiters
2012-10-18 10:36:53 +02:00
Laurent Destailleur
97001951e6
New: Add field stock into product export
2012-10-17 20:32:57 +02:00
simnandez
d7dcd3c14b
New: More import options. Supplier Products
2012-10-17 19:02:12 +02:00
Laurent Destailleur
4d5a6c6f01
Typo error
2012-10-17 15:07:13 +02:00
Laurent Destailleur
01bd20147e
Fix: Some fixes and enhancement into modularizing log functions
2012-10-17 14:46:20 +02:00
Laurent Destailleur
4a913cfb38
Merge pull request #449 from marcosgdf/odt-discounts
...
Created function to retrieve total discounted amount of a commonobject
2012-10-17 05:03:55 -07:00
simnandez
23d3b6a783
New: More import options. Supplier Products
2012-10-17 12:36:30 +02:00
simnandez
6f430cc630
New: More import options. Supplier Products
2012-10-17 11:43:26 +02:00
simnandez
cf814dc7fd
New: More import options. Categories
...
Trad: Add es_ES and ca_ES missing translations
2012-10-17 10:42:16 +02:00
simnandez
2cf88e7847
New: More import options. Categories
...
Trad: Add es_ES and ca_ES missing translations
2012-10-17 10:40:17 +02:00
Marcos García
3c051abc22
Orders and proposals should also replace {object_total_discount}
2012-10-16 13:43:50 +02:00
Marcos García
ac4ee01723
mod_syslog_syslog class shouldn't be active if openlog is not available
2012-10-16 13:39:23 +02:00
Marcos García
180eddff49
Because the rest of the class is using SYSLOG_CHROMEPHP_INCLUDEPATH it needs to be restored...
2012-10-16 02:25:48 +02:00
Marcos García
f250bb41e9
Removed unnecessary comments and commented unused config variables
2012-10-16 02:13:38 +02:00
Marcos García
07dcb07fd2
Created a modular syslog handler system
...
I've split all log handlers into classes so that people can make
new log handler systems without making changes to the core.
Also, now every log handler can handle how and what will be logged.
2012-10-16 02:01:37 +02:00
Marcos García
c9944a6b9b
Created function to retrieve total discounted amount of a commonobject
...
Also added an ODT tag to let people add it to their invoices, etc..
2012-10-15 00:49:39 +02:00
simnandez
6f799f8e16
New: More import options. Warehouses
2012-10-13 18:02:43 +02:00
Laurent Destailleur
6046feda11
Restore border into PDF
2012-10-11 09:42:47 +02:00
Regis Houssin
10bd942328
Fix: customer ref is very important for a best traceability
2012-10-10 12:04:08 +02:00
Regis Houssin
044ec61aba
Merge pull request #446 from atm-maxime/develop
...
Task # 186 : Forgot to add the new box in the mod definition...
2012-10-08 23:50:49 -07:00
Maxime Kohlhaas
67dbae4486
Correction for new box inclusion
2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9
Task # 186 : Forgot to add the new box in the mod definition...
2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91
Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits
2012-10-09 00:28:52 +02:00
Christophe Battarel
04be578863
fix wrong last update in cleansep function
2012-10-08 11:32:28 +02:00
Laurent Destailleur
bdb7becbc6
Fix: Try another fix on getTrad bug.
2012-10-04 09:44:04 +02:00
Laurent Destailleur
c25e908b75
Doxygen
2012-10-03 00:30:50 +02:00
Spangaro Alexandre
3ae6117e16
Reintegrate accounting.php in admin
2012-10-02 06:07:57 +02:00
Spangaro Alexandre
3e4fd761a5
Add function to choose chart of accounts
2012-10-02 05:45:49 +02:00
Laurent Destailleur
9db72fb50d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3
New: The discount on line for supplier invoices is now supported
2012-09-28 16:08:44 +02:00
Christophe Battarel
15d7266abf
import : add csv options (separator and enclosure)
2012-09-28 10:23:04 +02:00
Laurent Destailleur
6c769cfaf3
Fix: postgresql compatibility
...
Qual: Removed deprecated code
2012-09-27 23:54:47 +02:00
Laurent Destailleur
e94ddde91d
Fix: Patch calculation field odt
2012-09-27 21:08:32 +02:00
Regis Houssin
1919604089
Fix: more compatible with multicompany transverse mode
...
Fix: strict mode bubbles
2012-09-27 11:57:46 +02:00
Regis Houssin
d58c106f66
Fix: convert line delimiters !!!
2012-09-19 17:53:09 +02:00
Laurent Destailleur
533e285dad
Merge pull request #403 from simnandez/develop
...
Trad: Add ca_ES and es_ES translations
2012-09-19 05:53:43 -07:00
Laurent Destailleur
a68483d72f
Uniformize code.
2012-09-19 14:49:13 +02:00
Laurent Destailleur
1347ecf14e
Qual: Removed warnings
2012-09-19 12:49:58 +02:00
simnandez
dd9d3c8ba4
Fix: localtaxes must display in pdf even if they are in negative
2012-09-18 17:57:52 +02:00
Laurent Destailleur
889f71db6f
Fix: Color of lines must be set for each lines
2012-09-18 12:52:54 +02:00
Regis Houssin
8bab5fdadd
Fix: convert line delimiters
2012-09-17 19:37:02 +02:00
Laurent Destailleur
ef4831d119
Solved FIXME. I keep the code but commented, to keep source the more
...
similar as possible than invoices.
2012-09-17 11:46:50 +02:00
Regis Houssin
80eceab230
Fix: restore broken features
2012-09-17 07:15:38 +02:00
Regis Houssin
10b122578e
FIXME: $deja_regle not use in proposal?
2012-09-17 06:52:33 +02:00
Laurent Destailleur
cd6a8fa761
New: Uniformize code
2012-09-17 02:07:14 +02:00
Laurent Destailleur
2170801fd2
New: Uniformize pdf generation code. We also keep space to repeat pdf
...
head info.
2012-09-17 00:43:23 +02:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71
Fix: use getDocumentsLink method
2012-09-15 09:02:20 +02:00
Regis Houssin
4220229573
Fix: minor change
2012-09-14 15:56:50 +02:00
Laurent Destailleur
46ee00fc5e
A party to fish bugs and merou.
2012-09-13 18:28:03 +02:00
Marcos García
cb4044755b
Fixed export translations
...
Added missing strings
Corrected some translations
2012-09-12 19:11:03 +02:00
Marcos García
98092b952d
Fixed xinputuser emailing module
...
Lastname wasn't being recorded
2012-09-12 14:49:02 +02:00
Laurent Destailleur
1c91027a4e
Fix: Uniformize pdf code. Try to solve offset when a product line is
...
moved onto next page.
2012-09-11 14:03:16 +02: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
Regis Houssin
ee1cf819f7
Fix: mass convert line delimiters
2012-09-07 17:23:16 +02:00
Regis Houssin
5270ec06cb
Fix: compatibility with multicompany transverse mode
2012-09-07 17:20:12 +02:00
Laurent Destailleur
856c829c99
New: Add a selection module for emailing to enter a recipient from
...
gui.
2012-09-05 20:41:28 +02:00
Laurent Destailleur
84438d82f4
Qual: Clean module
2012-09-05 12:59:33 +02:00
Laurent Destailleur
b20c8d97c0
Fix: Checkstyle
2012-09-05 11:20:52 +02:00
Laurent Destailleur
246f3b5bb8
New: Add the holiday module (provided by teclib with permission to add
...
it by default).
2012-09-05 03:26:57 +02:00
Laurent Destailleur
55a5d56ebb
Fix: comment
2012-09-04 23:08:57 +02:00
Laurent Destailleur
2f680adbb5
Fix: We must use the shipping address.
2012-09-04 23:03:39 +02:00
Laurent Destailleur
aea89389e8
Qual: Uniformize pdf templates
...
Qual: Removed duplicate pdf templates when content with no technology
difference nor functionnal difference
2012-09-04 20:04:38 +02:00
Regis Houssin
15db85bc86
Fix: prepare external extended ged
2012-09-03 21:00:46 +02:00
Laurent Destailleur
9eb21c3d9f
Fix: Minot miscellanous fix
2012-09-03 10:17:58 +02:00
Regis Houssin
d2ae90f938
Fix: strict mode everywhere
2012-09-02 22:48:52 +02:00
Regis Houssin
0a88287b50
Fix: strict mode circus
2012-09-02 22:16:57 +02:00
Regis Houssin
afdab32bbf
Fix: avoid warnings (strict mode)
2012-09-02 22:12:56 +02:00
Regis Houssin
54860ef304
Fix: upgrade tcpdf and fpdi
2012-08-29 09:55:32 +02:00
Marcos García
7c0463b215
Used incorrect translation keys
...
Duplicated keys
2012-08-29 00:29:47 +02:00
Marcos García
c8869e65a6
Minor fixes to CerfaFR donation document
...
* Title wasn't localized
* Fixed donation ref
2012-08-28 09:58:15 +02:00
Laurent Destailleur
857a11f508
New: Can select thirdparties into emailing targets, even if module
...
category is not enabled.
2012-08-27 20:21:53 +02:00
Regis Houssin
3e2be54ead
Fix: restore old method
2012-08-27 19:11:44 +02:00
Laurent Destailleur
56d19437f4
Fix: [ bug #524 ] Donation receipt html_cerfafr is not localized
2012-08-26 18:01:29 +02:00
Regis Houssin
f322ec50ed
New: [ task #498 ] - final part
2012-08-25 15:21:34 +02:00
Regis Houssin
954f2afbc5
Fix: remove obsolete code
2012-08-25 10:49:59 +02:00
Grand Philippe
2d34e7bf8b
fix some issue within typhon pdf
2012-08-24 16:34:05 +02:00
Regis Houssin
4d1555f4ca
Merge pull request #338 from atm-maxime/mko515
...
Mko515
2012-08-23 00:01:05 -07:00
Maxime Kohlhaas
39de1cb010
Task 515 : Correction on SQL request
2012-08-23 08:43:29 +02:00
Marcos García
9b3c89ac47
Removed parenthesis from all include and include_once and replaced with single quotes
2012-08-23 02:40:41 +02:00
Maxime Kohlhaas
5fd10d14be
Task 515 : Corrections + target modules modifications
2012-08-23 00:00:01 +02:00
Marcos García
ea119c45a2
Lower-cased all <?PHP
2012-08-22 23:27:53 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Regis Houssin
4a5d89e6cc
Fix: move barcode type entries in module descriptor for best
...
compatibility with multicompany
2012-08-22 17:44:52 +02:00
Regis Houssin
3991e0b13d
Fix: add accountancy code error message
2012-08-20 01:29:13 +02:00
Regis Houssin
a856ad0afa
Fix: strict mode sunshine
2012-08-19 09:05:50 +02:00
Regis Houssin
bd99c2d23d
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-08-18 08:31:59 +02:00
Regis Houssin
d03b29ba78
Fix: [ bug #502 ] Error when validating cheque deposit
2012-08-18 08:30:29 +02:00
Regis Houssin
09e34068bc
Merge pull request #319 from marcosgdf/translations
...
A lot of improvements into translations
2012-08-17 22:22:56 -07:00
Regis Houssin
3438305169
FIXME: with ajax autocompleter, does not see the products that have no
...
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
2012-08-17 15:16:07 +02:00
Regis Houssin
b3d09478ca
Merge pull request #313 from lrq3000/develophooks
...
A lot of hooks and triggers implemented + custom substitution function for lines in ODT
2012-08-16 08:15:19 -07:00
Marcos García
f320ed92cc
Translated and upper-cased export formats, improved es_ES translations
...
fr_FR exports translations were made by @fhenry and Manuel Pintor (contact@idl-mp.com )
Little refactor too
2012-08-16 13:07:12 +02:00
Marcos García
cc4d5ff8d8
Removed the use of duplicated key translations
...
Nature is now being used instead of MorPhy
UserTitle is now being used instead of Civility
VATIntraVeryShort was being used were not necessary
2012-08-15 18:55:32 +02:00
Regis Houssin
48efabc8a4
Fix: remove deprecated function and avoid warnings
2012-08-15 09:06:36 +02:00
Stephen L
c0a314000c
Add custom ODT substitution for lines of products (completesubstitutionarray_lines)
...
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-08-14 16:03:45 +02:00
Maxime Kohlhaas
44b84b2177
task # 326 : Add a numbering module to suggest automatically a product ref
2012-08-09 01:41:55 +02:00
Laurent Destailleur
0d346ac1c1
New: A module can add several css and several js.
...
New: Removed lightbox as it is not compatible with GPL.
2012-08-08 20:43:23 +02:00
Laurent Destailleur
54c6db5b81
Qual: Uniformize code for pdf generation.
...
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
2012-08-08 04:12:20 +02:00
Laurent Destailleur
49f8f07737
Start to work on bug [ bug #251 ] and [ bug #260 ].
2012-08-06 19:22:14 +02:00
Regis Houssin
89cd23452f
Fix: missing delete shipping and delivery files
...
(minimum for possibility to merge with 3.2)
2012-08-05 20:41:11 +02:00
Laurent Destailleur
591b029781
Doxygen
2012-08-05 15:15:58 +02:00
Regis Houssin
d6a4d5ef41
Fix: avoid errors if install directory is deleted before module
...
activation
2012-08-01 14:42:24 +02:00
Marcos García
3520513c6b
Fixed an error that I introduced in a previous commit...
2012-07-31 00:53:05 +02:00
Laurent Destailleur
5772e46c9a
We start new modules with level "experimental".
2012-07-30 22:18:54 +02:00
Regis Houssin
e44fd4885d
Fix: change the last $DB to $db
2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46
Migrated ClassName to __construct() function
...
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Marcos García
be388b4418
Fixed some typos in es_ES and en_US translations
...
Allowed MailmanSPIP module configuration to be translated into other languages
Moved MailmanSPIP-related strings to mailmanspip.lang file
2012-07-29 22:23:51 +02:00
Regis Houssin
251640561f
Fix: strict mode happy hour
2012-07-28 12:35:11 +02:00
Regis Houssin
a157327859
Fix: strict mode paradise
2012-07-28 11:28:37 +02:00
Laurent Destailleur
1c557a96bd
Prepare task 473
2012-07-27 19:26:54 +02:00
Laurent Destailleur
0b048ebb94
[ bug #40 ] Export de donnes dangereux
2012-07-27 16:03:20 +02:00
Laurent Destailleur
dce9b96260
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/lib/repair.lib.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-07-25 12:20:45 +02:00
Regis Houssin
65e183c8c9
Merge pull request #258 from FHenry/develop
...
Develop
2012-07-24 09:15:36 -07:00
Laurent Destailleur
24c54ccaf1
Start to work on bug export
2012-07-24 16:19:46 +02:00
FHenry
8f2efa4879
Add syslog for debug
2012-07-24 14:25:21 +02:00
FHenry
3892c2ceca
Usubscribe mailling module
...
- Correct indentation
2012-07-24 13:24:22 +02:00
Regis Houssin
fb23364511
Fix: uniformize code
2012-07-23 16:10:54 +02:00
Regis Houssin
01ab1aa66f
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
...
into develop
Conflicts:
htdocs/core/modules/modCommissions.class.php
2012-07-23 11:07:53 +02:00
Regis Houssin
bf807c27e5
Fix: uniformize code
2012-07-23 11:01:36 +02:00
Laurent Destailleur
7a8224c4d5
Normalize code
2012-07-23 10:55:29 +02:00
Laurent Destailleur
ea93e62e91
Fix: Checkstyle
2012-07-23 10:46:09 +02:00
Regis Houssin
6e41d645f0
Merge pull request #251 from cbattarel/commissions
...
basic commissions management module
2012-07-23 01:37:09 -07:00
Laurent Destailleur
db4c6bd289
New: After first install, warning are visible onto mandatory setup
...
not configured. Show also total number of activated modules.
2012-07-22 01:03:19 +02:00
Christophe Battarel
b8fa4468ce
add commissions module
2012-07-20 16:21:35 +02:00
Regis Houssin
fafd79a0f8
Fix: uniformize code (in progress)
2012-07-20 09:57:50 +02:00
Christophe Battarel
98a2cf547e
correct module description and image
2012-07-19 16:27:08 +02:00
Christophe Battarel
c12c8bd0bb
update margin modules to core module
2012-07-18 16:13:29 +02:00
Regis Houssin
b53d108c50
Fix: uniformize code
2012-07-11 10:14:56 +02:00
Regis Houssin
28ccc43125
Fix: avoid another warning
2012-07-10 20:45:07 +02:00
Regis Houssin
b4617ee6cb
Fix: bad test
2012-07-10 18:57:09 +02:00
Regis Houssin
226caf0152
Fix: and again, and again, and again... (strict mode)
2012-07-10 13:20:53 +02:00
Regis Houssin
ca62c3dba8
Fix: compatibility with multicompany
2012-07-06 20:50:24 +02:00
Regis Houssin
30989fc6c3
Fix: lines delimiter
2012-07-04 16:55:14 +02:00
Regis Houssin
293eab7676
New: add possibility to hide vat only if null
2012-07-04 16:52:08 +02:00
Regis Houssin
cc4b2bf69c
New: add box activity
2012-07-04 09:07:15 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Laurent Destailleur
4176287094
Fix: Panicum module for supplier accountancy code
2012-06-28 19:51:25 +02:00
Laurent Destailleur
87efb2cbb0
Add log
2012-06-27 00:41:57 +02:00
Laurent Destailleur
4792727ca6
Fix: Label was not translated
2012-06-23 15:01:08 +02:00
Regis Houssin
4db07c3d34
Fix: avoid empty email address
2012-06-15 16:54:13 +02:00
Regis Houssin
1155b0097b
New: add advanced rights
2012-06-14 20:11:54 +02:00
Laurent Destailleur
ec621d2dcb
Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil
2012-06-14 19:58:35 +02:00
Regis Houssin
7644fa96dc
Fix: uniformize code and add specific rights
2012-06-13 21:48:59 +02:00
Regis Houssin
774be84c54
Merge pull request #220 from GPCsolutions/supplier-orders-box
...
New box showing the latest supplier orders.
2012-06-11 13:02:01 -07:00
Regis Houssin
cc18dab5c9
Fix: missing remove_file action
...
Fix: use object instead id and store odt filename in object for use in
triggers
2012-06-10 17:09:10 +02:00
Raphaël Doursenaud
0f410996f7
New box showing the latest supplier orders.
2012-06-04 17:37:38 +02:00
Laurent Destailleur
c1547b6ad0
Fix: Translation of payment term/cond
2012-05-21 20:17:58 +02:00
Laurent Destailleur
30c8fcd0e1
Fix: regression sql error
2012-05-09 16:45:15 +02:00
Laurent Destailleur
50944a71db
Checkstyle
2012-05-06 00:45:15 +02:00
Laurent Destailleur
d47a78479e
Fix: several fixes
2012-05-05 23:59:14 +02:00
Laurent Destailleur
d804683b32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-04-30 15:18:24 +02:00
Laurent Destailleur
1227642db0
Checkstyle
2012-04-30 15:01:20 +02:00
Regis Houssin
79f2781bdb
Merge pull request #188 from FHenry/develop
...
Develop
2012-04-30 05:33:48 -07:00
Laurent Destailleur
19ce632d7a
Removed duplicate file
2012-04-30 14:13:16 +02:00
FHenry
dc42e16ff1
Secure URL use to CheckRead and Unsubcribe with security key in
...
configuration screen
2012-04-30 13:49:29 +02:00
Laurent Destailleur
5c46c3bcbb
Fix: Class not deleted after move.
2012-04-29 10:32:37 +02:00
Laurent Destailleur
8ea079ed96
New: Prepare change to allow usage of print sheet for any purpose (not
...
only
memeber module).
Qual: Remove duplicate declaration of version.
2012-04-28 16:37:58 +02:00
Regis Houssin
071cef15bf
Merge pull request #175 from grandoc/develop
...
Prepair to display receiptdocument within a custom place and uniformize ...
2012-04-25 09:27:03 -07:00
Grand Philippe
559c7974e9
shipping receipt modele can be used from a custom directory
2012-04-22 10:02:12 +02:00
Grand Philippe
c190d4ddf8
fix : shipping specimen is displayed, and shipping modele can be used from custom place
2012-04-22 09:28:39 +02:00
FHenry
07fc51b7ff
Remove Eclipse variable warning
2012-04-20 15:54:37 +02:00
Laurent Destailleur
334adf7ae2
Fix: Bad CR for public note. Must work when text is full text with \n
...
and also when text is HTML with br.
2012-04-20 13:54:57 +02:00
Laurent Destailleur
9114fec4ed
Doxygen
2012-04-16 12:01:32 +02:00
Laurent Destailleur
b315bf3e3a
Fix: Generate donation document
2012-04-16 01:23:53 +02:00
Regis Houssin
e49df57667
Fix: compatibility with php 5.4 and E_STRICT mode
2012-04-14 15:04:46 +02:00
Regis Houssin
026ee8ddb7
New: add possibility to define a page break, its very important for
...
internal and external modules (milestone)
2012-04-12 20:52:41 +02:00
Laurent Destailleur
11c174e209
New: Can export supplier ref
...
New: Add profid6
2012-04-11 15:27:03 +02:00
Regis Houssin
02d2872ac5
Fix: invert emetteur and problem with long phone number
2012-04-10 12:35:14 +02:00
Regis Houssin
f5097dd605
Fix: missing company logo and invert from to !
2012-04-10 12:04:14 +02:00
Laurent Destailleur
9df05381d1
Fix: Bug war.
...
Look: enhance look for map views.
2012-04-08 13:05:58 +02:00
Laurent Destailleur
6d8a639839
Fix [ bug #322 ] export
...
Fix: pgsql compatibility
2012-04-08 00:05:52 +02:00
Laurent Destailleur
e9292515bc
Fix: Long name wrapping. Sender address is third party for supplier
...
order/invoice
2012-04-07 21:34:42 +02:00
Regis Houssin
921c8607d7
Fix: multicompany sharings and uniformize code
2012-04-07 10:19:33 +02:00
Regis Houssin
13624eeb86
Fix: multicompany sharings compatibility
2012-04-07 09:20:03 +02:00
Laurent Destailleur
6d2a3edf69
War bug
2012-04-07 02:45:31 +02:00
Regis Houssin
f874d68e08
Merge pull request #151 from grandoc/develop
...
Prepair to display within a custom place
2012-04-05 04:15:49 -07:00
Grand Philippe
a66c18c4f8
Prepair to display within a custom place
2012-04-05 13:00:09 +02:00
Regis Houssin
b30669a5d6
Fix: missing $langs
2012-04-05 11:07:16 +02:00
Laurent Destailleur
a6bbe1032d
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-04-04 17:37:20 +02:00
FHenry
5bfff3920f
Module e-maillling : Correctif et evolution Accusé de lecture et
...
desinscription
2012-04-04 15:23:32 +02:00
Regis Houssin
c57063878d
New: add workflow module part for external modules
2012-04-04 09:29:05 +02:00
Regis Houssin
14b6173d87
Fix: add width and minimum height of cells parameters
2012-04-03 18:01:27 +02:00
Laurent Destailleur
bb67c95c3d
Uniformize code
2012-04-02 20:08:08 +02:00
Laurent Destailleur
84057d46cc
Checkstyle
2012-04-02 18:37:37 +02:00
Laurent Destailleur
46251db167
Qual: Use a shared function to define logo heigth.
...
Qual: Add more phpunit tests
Fix: This also solve overlapping logos.
2012-04-01 23:57:15 +02:00
Laurent Destailleur
d8c975da3d
More fields into import of products
2012-03-30 00:54:41 +02:00
Laurent Destailleur
78ae7dc075
Checkstyle
2012-03-27 09:59:28 +02:00
Laurent Destailleur
52f4f72e6f
Checkstyle
2012-03-26 22:39:43 +02:00
Grand Philippe
b3e55e179f
first step to use fichinter within a custom place
2012-03-24 18:15:07 +01:00
Regis Houssin
ffc6812241
Fix: avoid php strict mode warning
2012-03-23 18:19:50 +01:00
Regis Houssin
3c794967c3
Fix: multiple avoid warning with php strict mode
2012-03-23 17:18:33 +01:00
Regis Houssin
be7da6f52c
Fix: avoid warning in php strict mode
2012-03-23 16:44:45 +01:00
Regis Houssin
1bcbe02562
Fix: wrong original values
2012-03-23 09:15:14 +01:00
Regis Houssin
de16037b93
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-03-23 09:03:58 +01:00
Regis Houssin
77623a9c1b
Fix: compatibility with ckeditor
2012-03-23 09:03:36 +01:00
Laurent Destailleur
6b2c141083
Uniformize page name.
2012-03-23 00:08:34 +01:00
Regis Houssin
5d2da2c884
Fix: uniformize code
2012-03-22 08:33:44 +01:00
Laurent Destailleur
b098838b6f
Fix: Bad error management when enabling/disabling modules
2012-03-21 13:50:59 +01:00
Regis Houssin
52a8216e3e
Fix: avoid php E_STRICT errors and compatibility with php 5.4
2012-03-21 02:12:44 +01:00
Laurent Destailleur
97f0095251
PDF are better with all PDF sizes
2012-03-20 09:22:41 +01:00
Laurent Destailleur
e7d07c0a91
New: add supplier ref on supplier invoice.
2012-03-19 22:26:24 +01:00
Laurent Destailleur
3383d314c9
Doxygen
2012-03-19 17:18:11 +01:00
Laurent Destailleur
d6588a53a1
Fix: Missing global
2012-03-19 11:22:59 +01:00
Regis Houssin
4ecc64504d
Fix: use the original json functions
2012-03-18 19:59:38 +01:00
Laurent Destailleur
23d523158a
Doxygen
2012-03-18 12:51:13 +01:00
Laurent Destailleur
96e9e088e3
Doxygen
2012-03-18 02:22:54 +01:00
Laurent Destailleur
dc86095c06
Doxygen
2012-03-18 02:19:27 +01:00
Laurent Destailleur
d59848e18e
New: Enhance box management
2012-03-17 21:32:10 +01:00
Laurent Destailleur
da94f76364
New: When a module with boxes is activated, box is also activated by
...
default for everybody, except for users that had personlized their box
view.
2012-03-17 14:29:48 +01:00
Laurent Destailleur
d8becd3cdb
Doxygen
2012-03-17 01:13:10 +01:00
Laurent Destailleur
02cdd86066
Doxygen
2012-03-17 00:47:01 +01:00
Laurent Destailleur
3f11e51fbb
Doxygen
2012-03-17 00:22:48 +01:00
Laurent Destailleur
46d08a9d3b
Doxygen
2012-03-16 09:35:59 +01:00
Laurent Destailleur
6e864bc992
Doxygen
2012-03-16 09:34:19 +01:00
Laurent Destailleur
d76802630a
Doxygen
2012-03-15 09:26:14 +01:00
Laurent Destailleur
9e5cffc62b
Doxygen
2012-03-14 11:49:11 +01:00
Laurent Destailleur
66bad9ea04
Doxygen
2012-03-13 09:38:00 +01:00
Laurent Destailleur
e4b697fa75
New: Show delivery date into proposal template azur.
2012-03-04 22:18:15 +01:00
Laurent Destailleur
055689e2dc
New: Import use generated codes if not provided into input file.
2012-03-04 13:00:53 +01:00
Laurent Destailleur
dd92cea7ed
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-03-03 20:57:00 +01:00
Laurent Destailleur
130bca84d6
Fix: fk_stcomm is no more required.
2012-03-03 20:56:39 +01:00
Regis Houssin
bbbca891f8
Fix: missing entity
2012-03-03 20:19:21 +01:00
Laurent Destailleur
80b75fa67d
Fix: boxes must not be removed after update
2012-03-03 17:37:45 +01:00
Laurent Destailleur
2772d1dfa2
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-03-03 16:34:13 +01:00
Laurent Destailleur
fb6aad19e5
New: Import wizard can import personalized fields
2012-03-03 16:33:38 +01:00
Regis Houssin
5139c0a69e
Fix: time is not necessary
2012-03-03 11:38:45 +01:00
Regis Houssin
b74e24ab46
Fix: increase size
2012-03-03 09:06:26 +01:00
Regis Houssin
047edc69f9
Fix: unit test warning
2012-03-03 07:45:25 +01:00
Laurent Destailleur
cb3104220e
Fix: Instantiate if not already done
2012-03-02 19:36:43 +01:00
Regis Houssin
034b0fc4d4
New: add dol_json_encode and dol_json_decode instead
...
serialize/unserialize
2012-03-02 17:48:05 +01:00
Regis Houssin
30c7bf811b
Fix: add pdf_writeLinkedObjects method
2012-03-02 15:03:46 +01:00
Regis Houssin
9301def08d
Fix: rename method
2012-03-02 15:03:14 +01:00
Regis Houssin
61e90e0d9d
Fix: add $hookmanager parameter
2012-03-02 10:26:03 +01:00
Regis Houssin
71e5e27e7e
Fix: instantiate $hookmanager if not exist
2012-03-02 10:16:50 +01:00
Regis Houssin
64b8486494
New: add method for show linked objects in pdf
2012-03-02 08:11:40 +01:00
FHenry
0cf4619682
Emailing campaign- unsubcribe and use of md5 tag
2012-03-01 14:51:07 +01:00
Laurent Destailleur
9174182a27
Fix: Removed warning
2012-03-01 09:24:45 +01:00
Regis Houssin
6aa7e90834
Fix: merge problem
2012-03-01 08:03:27 +01:00
Regis Houssin
f3cb926c3c
Fix: use generic array for all parts
2012-03-01 13:58:33 +08:00
Laurent Destailleur
7c4e908639
models_modules isn't enough so we use same facture_invoice,
...
commande_invoice, propale_invoice. This means module descriptor file
should contains
module_parts('facture'=>1) if we want to add doc template for invoice
into module/core/modules/facture/doc
2012-03-01 02:06:08 +01:00