Commit Graph

1426 Commits

Author SHA1 Message Date
Raphaël Doursenaud
3b493ab0ed Fix #2863 Sensible defaults for ChromePHP path
Use the provided ChromePHP class by default
2015-08-31 21:08:37 +02:00
Laurent Destailleur
feed3f714c Fix to avoid warning 2015-08-24 11:17:11 +02:00
Laurent Destailleur
1b409538a8 Fix #3400
Conflicts:
	htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00
Laurent Destailleur
c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Marcos García de La Fuente
f3ef4fed93 Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
Close #3313
2015-08-09 13:58:03 +02:00
Juanjo Menent
12b83fd3e8 Fix #3304 2015-08-07 12:45:27 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
fmarcet
6676114501 Fix: Not showing product supplier reference when page break 2015-07-27 16:31:40 +02:00
fmarcet
e130af8033 Fix: Not showing delivery date on rouget pdf (expedition) 2015-07-27 13:11:07 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
Regis Houssin
4273c4aad9 Fix: data can be just a value, not an array 2015-07-03 11:35:11 +02:00
Regis Houssin
4fb5af7442 Fix: reset the current entity 2015-07-03 10:58:55 +02:00
Laurent Destailleur
c218843cdb FIX Save of filters into export profiles failed. 2015-06-24 18:29:29 +02:00
phf
06962cb4e6 FIX : tool export handle the type "select" extrafields and return the value instead of id 2015-06-23 16:26:05 +02:00
Laurent Destailleur
6e72d3c8cc FIX Export of tags for contact and member 2015-06-01 21:34:21 +02:00
Laurent Destailleur
f275145bd2 FIX We did a test on a permission to export contract when permission did
not exists.
2015-05-10 23:46:34 +02:00
Laurent Destailleur
afc487ef9d Fix phpcs 2015-05-07 13:28:03 +02:00
Laurent Destailleur
36ebaf7a22 Clean code 2015-05-06 23:31:03 +02:00
Maxime Kohlhaas
72c4337f4b Fix : shipment PDF was not using generation params
Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php
2015-05-06 21:18:31 +02:00
Juanjo Menent
ea95a461e2 Fix: Make propal pdf "azur" compatible with the two products images
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
2015-05-06 17:17:41 +02:00
Maxime Kohlhaas
42455f771a Missing comments 2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
b203263e91 Fix : shipment PDF was not using generation params 2015-05-06 12:16:36 +02:00
Laurent Destailleur
467ee7b771 Fix error into export filter step
Conflicts:
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modContrat.class.php
	htdocs/core/modules/modFournisseur.class.php
2015-05-05 12:45:38 +02:00
Raphaël Doursenaud
93937fe7f3 Allow exporting projects without a third party
FIX #2729
2015-05-01 15:58:36 +02:00
Raphaël Doursenaud
a6b0f6cfac Allow exporting projects without a third party
FIX #2729
2015-05-01 15:56:39 +02:00
Raphaël Doursenaud
afc582a369 Fixed SQL table reference for members types in export
FIX #2712
2015-04-30 17:20:53 +02:00
Raphaël Doursenaud
f1032baaab Allow exporting projects without a third party
FIX #2729
2015-04-30 11:48:32 +02:00
Laurent Destailleur
060d8a1a38 FIX Ref/label of product on contract line was not visible, nor into
page, nor into PDF.
2015-04-29 19:57:01 +02:00
Laurent Destailleur
7f5377d219 Fix #2695 2015-04-22 19:25:20 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Raphaël Doursenaud
54b8aa8a0b Fixed typo in task export
Closes #2607, #2609
2015-04-14 19:14:16 +02:00
Laurent Destailleur
761409caf6 Fix sql error 2015-04-02 15:17:07 +02:00
Laurent Destailleur
1ca95acbd7 Fix pb during export of agenda events
Conflicts:
	htdocs/exports/export.php
2015-03-26 11:23:21 +01:00
Laurent Destailleur
73266bb965 Fix error when using a log hangler that make output into the http
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
2015-03-21 01:22:05 +01:00
Laurent Destailleur
c4ff66c5d7 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-03-14 13:46:18 +01:00
Laurent Destailleur
89b22be063 FIXED: Allowed 0 to be used as an account mask. Required by CEGID. 2015-03-14 13:44:26 +01:00
Laurent Destailleur
ca34575df4 FIXED: Allowed 0 to be used as an account mask. Required by CEGID. 2015-03-14 13:42:00 +01:00
Laurent Destailleur
5670e92842 Position of field into pdf baleine 2015-03-14 12:35:03 +01:00
fmarcet
1a02f6aa80 Fix: Masks works with thirdparty type 2015-03-04 18:18:55 +01:00
Laurent Destailleur
3475433eaf Fix: the bank information were visible into pdf but were not using
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Laurent Destailleur
3fb3e4af4e Merge pull request #2386 from lrq3000/3.7
Fix lastrowid-*table* option when defining imports
2015-02-24 17:16:17 +01:00
Laurent Destailleur
74f15680e1 Fix missing fields into import of thirdparties.
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
2015-02-24 15:40:50 +01:00
Laurent Destailleur
44c392ca23 Fix missing profid5 and 6 2015-02-24 13:35:37 +01:00
Stephen L
fe62e038ca Fix lastrowid-*table* option when defining imports (fix extrafields fk_object value)
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2015-02-22 14:34:51 +01:00
Laurent Destailleur
9ac38dee45 Merge pull request #2367 from marcosgdf/bug-1652
Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients
2015-02-20 23:27:53 +01:00
Laurent Destailleur
06c90e67bb Merge pull request #2339 from KreizIT/fix_1829
FIXED: #1829 POS not compatible with batch products
2015-02-18 22:38:19 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +01:00
Laurent Destailleur
685b8d722d Fix: Bad hook name 2015-02-17 16:46:37 +01:00