Regis Houssin
a108abddda
Fix: disabled ajax for the moment
2012-11-01 10:48:48 +01:00
Laurent Destailleur
0328f0de11
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-31 19:38:28 +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
Regis Houssin
455d399bce
Fix: remove tag
2012-10-31 16:15:37 +01:00
Regis Houssin
bacc8991b3
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-31 15:51:22 +01:00
Regis Houssin
634b5f7d1b
Fix: image is hard defined
2012-10-31 15:50:14 +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
Regis Houssin
b70af837df
Fix: avoid warning
2012-10-31 09:59:24 +01:00
Regis Houssin
2607a8a3dd
Merge pull request #470 from atm-maxime/develop
...
Fix : internal contact not displayed in rouget PDF
2012-10-31 01:51:36 -07:00
Regis Houssin
0e0bbbeddc
Fix: morning strict mode
2012-10-31 09:50:20 +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
066bcbb469
Qual: Add dol_format_address PHPUnit tests
2012-10-31 01:45:48 +01:00
Laurent Destailleur
8ea48b28eb
New: More complete setup for bank ids according to countries
2012-10-31 00:46:46 +01:00
Laurent Destailleur
1d7820c5ac
New: English bank account need a bank code (called sort code) to
...
identify an account.
2012-10-31 00:22:13 +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
df6c29ba0b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-10-30 13:00:22 +01:00
Laurent Destailleur
9bee735c2d
Fix: Bad code for specimen
2012-10-30 12:02:13 +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
Laurent Destailleur
6bfe3e3905
Fix: Translation
2012-10-30 09:43:31 +01:00
Laurent Destailleur
1bbdfc3717
Fix: DTD used for HTML output pages is HTML, not XML.
2012-10-29 19:32:10 +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
Regis Houssin
44f591e600
Fix: can't delete an export
2012-10-29 10:36:26 +01:00
Regis Houssin
705b0c0d52
Fix: better for show signature
2012-10-29 10:00:24 +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
Regis Houssin
82cb0802d0
Fix: broken feature, missing $page
...
Fix: bad field name
2012-10-28 02:14:08 +02:00
Laurent Destailleur
a6bd506bd0
Fix: syntax error
2012-10-27 20:32:33 +02: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
Laurent Destailleur
6c0fb9a1f1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-27 20:04:03 +02:00
Laurent Destailleur
a7e35a9308
Fix: If we exclude dirs, we must also clean array to avoid to count
...
them.
2012-10-27 20:02:09 +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
Regis Houssin
6b07579620
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-27 11:30:36 +02:00
Regis Houssin
2bbfad2460
Fix: missing parameter
2012-10-27 11:30:08 +02:00
Christophe Battarel
eb4cf359ec
fix error in constant name for SOCIETE_CODEFOURNISSEUR_ADDON in get_codefournisseur()
2012-10-27 11:12:41 +02:00
Laurent Destailleur
443f5ca03e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-27 00:23:54 +02:00
Laurent Destailleur
7a48351909
Fix: delete file from ecm module
2012-10-27 00:23:16 +02:00