Maxime Kohlhaas
7d16f62a9d
New : add remaining to ship on delivery PDF
2014-06-28 22:48:20 +02:00
BENKE Charles
fa75ef3b57
made change on all the modules_element definition
2014-06-21 00:35:11 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
94335b186e
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b
Fix: CRLF
2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f
Fix: When number reach 9999 with default numbering module, next number
...
will be 10000 instead of 0000 and error.
2014-05-21 19:44:53 +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
Laurent Destailleur
647d431857
Fix: contact of delivery of order not visible into typhon pdf.
2014-05-06 13:43:41 +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
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
bd8cdd337a
Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
2014-04-26 22:17:11 +02:00
Raphaël Doursenaud
7497a72b1d
Qual: Removed dead code
2014-04-23 18:24:07 +02:00
Raphaël Doursenaud
4f3a28e7ed
Qual: Removed unused variable
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
5d74a5a852
Qual: Wrong variable name
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
70606d04ea
Qual: Missing global declaration
2014-04-23 18:24:06 +02:00
Raphaël Doursenaud
e7d9423812
Qual: Wrong variable name
2014-04-23 18:24:06 +02:00
Laurent Destailleur
2f10198064
Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
...
making a pagebreak higher than 2 pages.
2014-03-19 16:36:12 +01:00
Laurent Destailleur
bf735cacbe
Fix PDF: Page break was ko when breaking 2 pages or more.
...
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
2014-03-19 13:32:54 +01:00
Laurent Destailleur
d111ee97c2
Doc
2013-09-25 12:37: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
0f86755033
Fix: Found a dozen of bugs into sub module delivery of module shipment.
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/fiche.php
2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717
Fix: Found a dozen of bugs into sub module delivery of module shipment.
2013-08-07 15:08:30 +02:00
Laurent Destailleur
e234d5342d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Florian Henry
d6f31d61bf
Fix Typhon model $mysoc global is missing
2013-07-29 12:21:52 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Maxime Kohlhaas
1199e61f4b
CRLF issue
2013-07-26 12:33:58 +02:00
Laurent Destailleur
339118d6f4
Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-24 20:20:31 +02:00
Laurent Destailleur
6b1b6b4fee
Fix: Color no more lost
2013-07-24 20:20:10 +02:00
Laurent Destailleur
bf9b255c92
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Laurent Destailleur
134187ef94
Fix: Overlapping of company name.
...
Fix: Missing state for ome countries.
2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a
Fix: Overlapping of company name.
...
Fix: Missing state for ome countries.
2013-07-01 00:05:39 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Laurent Destailleur
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
df0b0ebf51
Fix: Uniformize pdf code for typhon. This should also solve problem
...
of overlapped text into delivery receipts.
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-04-19 09:52:25 +02:00
Laurent Destailleur
5c1b3d86c3
Fix: Uniformize pdf code for typhon. This should also solve problem
...
of overlapped text into delivery receipts.
2013-04-19 09:44:37 +02:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +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
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
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
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
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +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
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
