Andrelec1
0b5707c1cf
Add Reduction value in pdf
...
Add value of %reduction in pdf
2014-08-01 14:49:42 +02:00
Maxime Kohlhaas
d61e5bae93
Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related
2014-06-28 17:01:52 +02:00
Laurent Destailleur
a2724822d7
Fix: Add hidden option to partially fix a bug. A more complete fix
...
should be done later.
2014-06-20 16:01:08 +02:00
Laurent Destailleur
8d1fdec8cf
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/fiche.php
htdocs/projet/fiche.php
2014-06-20 15:26:02 +02:00
Laurent Destailleur
221d7b56aa
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
Conflicts:
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
2014-06-20 12:52:08 +02:00
Laurent Destailleur
8ce8bf47ee
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
Conflicts:
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
2014-06-20 12:48:08 +02:00
Laurent Destailleur
4087781236
Fix: The object deliverycompany was not used anymore and output of
...
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.
2014-06-20 12:41:23 +02:00
Laurent Destailleur
b124007c8c
Merge remote-tracking branch 'origin/3.5' into develop
2014-06-09 15:30:41 +02:00
Laurent Destailleur
768163c6fc
Fix: Easy fix to solve pb with pagebreak when adding image
2014-06-06 12:57:12 +02:00
Laurent Destailleur
171227e43a
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2014-06-06 12:00:21 +02:00
Laurent Destailleur
905f700136
Fix: Pb with pagebreak when adding image
2014-06-06 11:57:45 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
ae01c785c5
Fix: Do not show ref supplier title if ref_supplier not set (currently
...
always the case with 3.5).
2014-05-25 03:57:13 +02:00
Laurent Destailleur
845f764f93
Increase default size of image
2014-05-07 12:21:14 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
philippe
a04cd99090
fix : no room when number of pages sup than 9
2014-05-05 19:03:25 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Raphaël Doursenaud
6788c5b7f8
Qual: Wrong type in method documentation
2014-04-23 18:24:03 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Grand Philippe
42b6628b76
translation and cleaning
2014-04-07 09:54:24 +02:00
KreizIT
a0f1a60780
Change on shipment for batch product
2014-03-07 11:35:16 +01:00
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
