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
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
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
e39ec132e5
Fix: Checkstyle
2012-12-19 20:59:08 +01:00
Laurent Destailleur
11ab579639
Fix: Several fixes to avoid PDF lib conflicts.
2012-12-19 13:06:45 +01:00
Laurent Destailleur
e3d07621eb
Fuck git. Restore another lost commit.
2012-12-04 20:51:45 +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
31b37c5aff
Fix: Length not hard coded
2012-12-01 11:31:02 +01:00
Laurent Destailleur
624c0fa040
Fix: Restore compatibility with FPDF.
2012-11-30 20:31:43 +01:00
Laurent Destailleur
f87865f039
Fix: crazy pagebreak when warterwark is higher than free space.
2012-11-02 14:21:32 +01:00
Laurent Destailleur
9b1f70e58e
Fix: Trick to solve easily problem of font for some foreign users.
2012-10-31 19:38:16 +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
6f9c9fcd55
Fix: Free text overlap data when not on last page.
2012-10-30 13:11:17 +01:00
Laurent Destailleur
9d44590980
Fix: Using a more precise function to calculate free texts height avoid
...
having few pixels offset on free texts.
2012-10-30 11:17:49 +01:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Regis Houssin
b5ba6ef4d9
Fix: broken feature, enable source details by default
2012-09-06 12:37:36 +02:00
Regis Houssin
54860ef304
Fix: upgrade tcpdf and fpdi
2012-08-29 09:55:32 +02:00
Regis Houssin
d88abe8df0
Fix: use label instead libelle
2012-08-25 12:07:18 +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
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +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
Regis Houssin
28ccc43125
Fix: avoid another warning
2012-07-10 20:45:07 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Regis Houssin
761f841735
Fix: missing contract reference
2012-07-02 10:37:39 +02:00
Laurent Destailleur
44f31bf21c
Fix: The fix made by renaming PDF_ADDALSOTARGETDETAILS into MAIN_PDF_ADDALSOSOURCEDETAILS was fixing things in the wrong direction. The regression was the missing data on the recipient compared to 3.1.1
2012-06-15 11:16:17 +02:00
Laurent Destailleur
3fe6ed9a7d
Fix: Messy source address
2012-06-14 17:50:32 +02:00
Laurent Destailleur
6cd03f9ccd
Fix: typo error
2012-06-13 20:13:57 +02:00
Laurent Destailleur
a862b5d5c3
Fix: Try a better fix. Format of content of table should depend of
...
content and output rules and not on how data was input.
2012-04-28 16:58:32 +02:00
Regis Houssin
0ad2c4a027
Fix: problem of line break between label and description when
...
using fckeditor
2012-04-26 10:30:18 +02:00
Laurent Destailleur
c42a854a87
Fix: wrong encoding of special chars
2012-04-20 14:09:30 +02:00
Laurent Destailleur
4b8eeead2c
Fix: Add hidden option to restore lost feature.
2012-04-20 13:55:06 +02:00
Regis Houssin
02d2872ac5
Fix: invert emetteur and problem with long phone number
2012-04-10 12:35:14 +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
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
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
18aecbaa9e
Add test to work with old FPDF.
2012-03-20 01:42:18 +01:00
Laurent Destailleur
3383d314c9
Doxygen
2012-03-19 17:18:11 +01:00
Laurent Destailleur
ed41e03589
Qual: Fix a ton of CheckStyle errors
2012-03-18 19:23:01 +01:00
Regis Houssin
ca468c2f84
Fix: hook object more simple
2012-03-09 14:48:56 +01:00
Regis Houssin
99c177df46
Fix: missing object $db
2012-03-09 08:28:30 +01:00
Regis Houssin
ee86da0e1e
Fix: refactorize llx_c_currencies and currency symbol
2012-03-08 11:49:38 +01:00
Regis Houssin
30c7bf811b
Fix: add pdf_writeLinkedObjects method
2012-03-02 15:03:46 +01:00
Regis Houssin
e1f97c009b
Fix: for add external linked objects
2012-03-02 17:52:47 +08:00
Regis Houssin
5b3a3b8e2e
Fix: add array return
2012-03-02 17:40:16 +08:00
Regis Houssin
f39e156f3a
New: add pdf_getLinkedObjects hook
2012-03-02 08:31:38 +01:00
Regis Houssin
64b8486494
New: add method for show linked objects in pdf
2012-03-02 08:11:40 +01:00
Regis Houssin
3b0beed51d
Fix: professionnal id only visible if not empty
2012-02-24 16:52:33 +01:00
Laurent Destailleur
8d6655061e
Qual: Full description of lines for ODT generation share same
...
function.
2012-02-19 21:08:17 +01:00
Laurent Destailleur
75bb0eddd7
Fix: Bad br.
2012-02-19 20:31:59 +01:00
Laurent Destailleur
7afcee03b9
Work on debian package
2012-02-18 03:29:43 +01:00
Laurent Destailleur
ffac9689f4
Doxygen
2012-02-04 14:39:47 +01:00
Christophe Battarel
acf95fa646
rajout commentaires entete programme
2012-01-16 17:36:22 +01:00
Christophe Battarel
cc6932e0ba
pdf.lib.php : ne pas traduire les textes à partir des textes produits si ils ont été modifiés à la saisie.
2012-01-16 17:33:00 +01:00
Laurent Destailleur
c2348ef600
Uniformize field country_id, country_code, country
2011-12-29 18:07:41 +01:00
Laurent Destailleur
277564d7e2
Fix: Avoid to encode with dol_htmlentitiesbr twice.
2011-12-08 20:20:16 +01:00
Laurent Destailleur
1b2c0120da
Qual: Try to reduce call to convToOutputCharset
2011-12-07 18:10:24 +01:00
Laurent Destailleur
9df57875ce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2011-12-07 10:50:04 +01:00
Grand Philippe
4c575ced72
fix error commit
2011-12-06 16:07:34 +01:00
Grand Philippe
1481d0b79e
creating the all file of currencies symbol in decimal unicode. Need some
...
font to get all working.
2011-12-06 15:09:11 +01:00
Laurent Destailleur
28afd2e3c6
Doxygen
2011-12-06 00:39:24 +01:00
Laurent Destailleur
b0aff1c927
Fix: fix not initialized variables
2011-12-05 17:13:48 +01:00
Grand Philippe
28cd577c6c
To get columns "P.U.TTC" and "Total TTC" within pdf
2011-12-03 23:37:16 +01:00
Laurent Destailleur
56a0e26465
Fix: Removed tons of warnings
2011-12-01 17:09:01 +01:00
Laurent Destailleur
839781dfbe
Qual: Removed a TODO by renaming all ->monnaie into ->currency
2011-11-23 14:55:36 +01:00
Laurent Destailleur
1770a46519
Qual: Removed tons of warning
2011-11-22 14:00:03 +01:00
Laurent Destailleur
bf9c482f8a
Fix: Deposits was not included into lines but into into remain to pay
2011-11-16 18:58:11 +01:00
Regis Houssin
b72ef91f19
Fix: carriage return problem
2011-11-12 12:56:33 +01:00
Laurent Destailleur
9ec3500b1f
New: Add option INVOICE_POSITIVE_CREDIT_NOTE
2011-11-11 00:36:01 +01:00
Regis Houssin
56d6cbe56f
[task #216 ] Move lib in core directory
2011-10-24 12:59:44 +02:00
