Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Florian Henry
c2a8967b52
Much better fix for translated product description into PDF
2013-12-03 17:06:19 +01:00
Florian Henry
3e712c9c8c
Finnaly make it works
2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb
Avoid strpos bug if string is empty or null
2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e
remove useless space
2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28
Better Fix
2013-12-02 10:27:41 +01:00
Florian Henry
c0ef63fd74
Bteer fix
2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e
Better test for HTMLentities desc translation
2013-12-02 00:20:50 +01:00
Florian Henry
c6991f97d4
[ bug #1174 ] Product translated description not good into PDF
...
Country
2013-12-01 22:47:22 +01:00
Cédric Salvador
c73057ead9
show page number
2013-11-22 09:51:48 +01:00
Raphaël Doursenaud
b6eecb0394
Developer documentation fix
2013-11-07 22:14:43 +01:00
Laurent Destailleur
c81bb60384
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/public/cron/cron_run_jobs.php
2013-10-27 02:33:03 +02:00
Grand Philippe
c773f21c2c
fix wrong call name
2013-10-19 12:50:18 +02:00
Laurent Destailleur
065c87d81c
Qual: uniformize code: property ->tel on objects is now ->phone
...
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
9fa6d4ccdf
Fix: Avoid error for free products. Also add hidden otion to enable
...
this. In most cases, we don't want to do this.
2013-09-06 10:40:44 +02:00
Grand Philippe
6d6f30725b
Add an additional description for the category products
2013-09-03 11:41:33 +02:00
Grand Philippe
dfdc9da781
Add an additional description for the category products
2013-09-03 11:15:19 +02:00
Laurent Destailleur
8c90ad8afa
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/modFacture.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
htdocs/expedition/fiche.php
htdocs/fourn/fiche.php
htdocs/langs/el_GR/admin.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bills.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/categories.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/ecm.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/exports.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/holiday.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mailmanspip.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/members.lang
htdocs/langs/el_GR/opensurvey.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/oscommerce.lang
htdocs/langs/el_GR/other.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/products.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Laurent Destailleur
1c527b8db9
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-08-24 20:59:02 +02:00
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +02:00
Grand Philippe
49e38e1263
fix some trad
2013-08-16 10:16:06 +02:00
Laurent Destailleur
fe079f71da
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-07-25 21:53:38 +02:00
Laurent Destailleur
16d530b22d
Fix: Watermark make pagebreak crazy.
2013-07-25 18:58:47 +02:00
Laurent Destailleur
58da76292f
Fix: Watermark make pagebreak crazy.
2013-07-25 18:56:09 +02:00
Laurent Destailleur
dd10ff8a11
eol
2013-07-15 18:51:56 +02:00
Laurent Destailleur
6a1446f4dd
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-14 16:35:02 +02:00
Laurent Destailleur
3a9ffb19c3
fix: eol
2013-07-13 21:14:05 +02:00
Regis Houssin
7e70d935b6
Fix: change for use url of image
2013-07-03 16:07:31 +02:00
Regis Houssin
a9198e66eb
Fix: change for use url of image
2013-07-03 16:06:42 +02:00
Laurent Destailleur
a50cd7b698
Fix bug into script that fix CRLF into LF
2013-06-12 11:59:55 +02:00
Regis Houssin
d9f2ad4ff4
Revert "Fix: hookmanager code"
...
This reverts commit 89c3cfec3a
2013-06-11 09:36:39 +02:00
Regis Houssin
89c3cfec3a
Fix: hookmanager code
2013-06-10 19:46:37 +02:00
Laurent Destailleur
51d11ff190
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.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/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
2013-06-09 16:49:47 +02:00
Laurent Destailleur
b4abe58237
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
Laurent Destailleur
2c71c898eb
Fix: param lang not provided to price function
2013-06-08 15:21:47 +02:00
Laurent Destailleur
840dcfec38
Fix: Bad detection of PDF format.
2013-04-29 09:25:42 +02:00
fhenry
c988944f1a
PDF admin : Add option to hide num TVA intra into adress of customer
2013-04-26 13:25:51 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
3ef8bf55fa
Fix: Better line position of information
2013-03-24 16:17:36 +01:00
Laurent Destailleur
ff2407a454
Add hidden option to setup font size of information.
2013-03-24 14:01:33 +01:00
fhenry
9f9f6c8311
[ task #767 ]
2013-03-15 11:59:15 +01:00
Laurent Destailleur
0f1741a06b
New: hooks for pdf_writelinedesc now implement the rule to overwrite or
...
not default code (http://wiki.dolibarr.org/index.php/Hooks_system )
2013-03-09 15:05:09 +01:00
Grand Philippe
d8edb3c074
display enhancement for models
2013-02-26 17:41:08 +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
simnandez
94d1f6e0c2
Fix: sourcecompany now works with state instead departement (deprecated)
...
into build_address
2013-02-19 16:05:55 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
a5b174eccc
Fix: Architecture of getCurrency was wrong. Cache was not stored
...
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +01:00
