Laurent Destailleur
4b51fc80a6
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2015-08-13 00:06:27 +02:00
Laurent Destailleur
958321b64d
Merge pull request #3340 from atm-maxime/3.6
...
Rowid was missing on expedition line so no origin id when creating an invoice
2015-08-12 23:39:43 +02:00
Marcos García de La Fuente
e2797ddd40
Merge branch '3.6' into bug-3342
...
# Conflicts:
# ChangeLog
2015-08-10 17:48:18 +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
Marcos García de La Fuente
7cb564586e
Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything
...
Close #3310
2015-08-09 13:52:02 +02:00
Marcos García de La Fuente
2f921b6431
Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate
...
Close #3342
2015-08-09 13:46:48 +02:00
Marcos García de La Fuente
a24f29ba8b
Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php
...
Close #3341
2015-08-09 13:37:05 +02:00
Maxime Kohlhaas
e13515e59f
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
2015-08-06 08:57:52 +02:00
Marcos García de La Fuente
a1f74763da
Merge branch '3.5' into bug-3206
...
Conflicts:
ChangeLog
2015-08-03 18:55:01 +02:00
Juanjo Menent
22b4bfd1a4
Merge pull request #3334 from GPCsolutions/3.6-3314
...
Fix #3314 Display state in bank account card
2015-08-01 14:40:42 +02:00
Maxime Kohlhaas
9e05cecc1a
Fix : rowid was missing on expedition line so no origin id when creating an invoice
2015-07-31 16:31:12 +02:00
Laurent Destailleur
6adc3ba604
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2015-07-30 14:54:33 +02:00
Raphaël Doursenaud
3b9c8a685b
Fix #3314 Display state in bank account card
2015-07-29 19:29:18 +02:00
Laurent Destailleur
c2eb47f3a1
Merge pull request #3325 from atm-ph/3.6_fix_timespent_id
...
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
2015-07-28 18:36:48 +02:00
phf
824da6d2b0
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
2015-07-27 17:38:27 +02:00
fmarcet
6676114501
Fix: Not showing product supplier reference when page break
2015-07-27 16:31:40 +02:00
Maxime Kohlhaas
646ad48bd0
Better fix for not numeric qty or discount
2015-07-21 10:50:07 +02:00
Maxime Kohlhaas
428bd14b55
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
...
# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.
2015-07-21 10:49:47 +02:00
Marcos García de La Fuente
038f171d6c
Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries
...
Close #3074
2015-07-20 12:18:30 +02:00
Laurent Destailleur
fbc0b5b313
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/contact/vcard.php
htdocs/societe/consumption.php
2015-07-19 11:38:44 +02:00
Laurent Destailleur
2e2f99c351
Merge branch 'bug-3180' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-3180
Conflicts:
ChangeLog
2015-07-19 11:28:48 +02:00
Laurent Destailleur
4100026c71
Merge branch 'bug-3268' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-3268
Conflicts:
ChangeLog
2015-07-19 11:27:28 +02:00
Laurent Destailleur
8d7c1f8d4c
Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid
2015-07-19 11:21:21 +02:00
Marcos García de La Fuente
3d6c5b09e8
Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter
...
Close #3268
2015-07-19 11:19:47 +02:00
Marcos García de La Fuente
538c8c072b
Merge branch '3.5' into bug-3180
...
Conflicts:
ChangeLog
2015-07-19 11:16:36 +02:00
Marcos García de La Fuente
d0b1652efd
Merge branch '3.5' into bug-3206
...
Conflicts:
ChangeLog
2015-07-19 11:16:10 +02:00
Marcos García de La Fuente
4649cf7210
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
...
Close #3206
2015-07-18 19:40:48 +02:00
Marcos García de La Fuente
b28c4df0d6
Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result
...
Close #3180
2015-07-18 17:35:36 +02:00
Marcos García de La Fuente
7185cfeb84
Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names
2015-07-18 14:48:59 +02:00
Marcos García de La Fuente
e9d1e6265d
Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics
...
Close #2696
2015-07-18 14:25:05 +02:00
Maxime Kohlhaas
5223934ff0
Fix #3188 SQL error if qty or discount is not a number on proposal add line
2015-07-14 12:17:50 +02:00
Maxime Kohlhaas
20bdfdb286
Fix : withdrawal rejection were taking the total amount of the invoice instead of the amount of the withdrawal
2015-07-14 11:57:47 +02:00
Regis Houssin
9e7cb70d63
Fix: missing shared parameters
2015-07-08 16:03:15 +02:00
Laurent Destailleur
5d588714f0
Merge pull request #3135 from atm-ph/3.6_fix_socpeople_country_display
...
FIX : wrong display with contact country
2015-07-04 04:41:20 +02:00
Maxime Kohlhaas
5d14d05ce1
Fix : Social contribution payment deletion was not deleting the bank line
2015-07-03 16:38:54 +02:00
phf
c87328b362
FIX : contact country had wrong display if the country dont have translate
2015-07-02 17:00:37 +02:00
Maxime Kohlhaas
ee643ed2a7
Fix : Project list was not keeping parameters on sorts
2015-07-02 14:08:16 +02:00
Laurent Destailleur
461b5f0882
Merge pull request #3086 from atm-ph/3.6_fix_export_extrafield_select
...
FIX : tool export extrafields
2015-06-27 02:20:39 +02:00
phf
582f9cd214
FIX : keep filter by category or by not enough stock if we switch page
2015-06-26 11:04:08 +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
fmarcet
05cb1f7ba7
Fix: Date filter on customer orders
2015-06-16 16:59:48 +02:00
Laurent Destailleur
34468644ef
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-06-16 11:15:16 +02:00
Marcos García de La Fuente
2d3ab3b658
Merge remote-tracking branch 'upstream/3.5' into bug-2814-2
...
Conflicts:
ChangeLog
2015-06-15 09:39:17 +02:00
Laurent Destailleur
f4da53c300
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
2015-06-14 17:04:24 +02:00
Laurent Destailleur
1007aba6a9
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2015-06-14 17:02:11 +02:00
Laurent Destailleur
14a8a2269b
FIX End log must use same level then start log.
2015-06-14 16:59:35 +02:00
Laurent Destailleur
fadc640335
Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-2835
Conflicts:
ChangeLog
2015-06-14 16:07:19 +02:00
Laurent Destailleur
d0b2c492a0
Merge branch 'bug-2837' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-2837
Conflicts:
ChangeLog
2015-06-14 16:06:14 +02:00
Laurent Destailleur
e915a54c39
Merge branch 'bug-2861' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-2861
Conflicts:
ChangeLog
2015-06-14 16:03:44 +02:00
Laurent Destailleur
f8d2e93878
Merge pull request #3044 from hregis/3.5_bug
...
Fix: select date problem with mobile device (#3039 )
2015-06-14 15:29:35 +02:00
Regis Houssin
b96ed08260
Fix: select date problem with mobile device ( #3039 )
2015-06-14 12:46:27 +02:00
Laurent Destailleur
fdced80a48
Merge pull request #3035 from marcosgdf/bug-2786
...
FIX #2786 Objectline_add template shows "0" for non-vat suppliers
2015-06-14 02:15:27 +02:00
Laurent Destailleur
a9bf38b8d3
Merge pull request #3022 from marcosgdf/bug-2976
...
FIX Close bug #2976 : "Report" tab is the current tab but it is not marked as selected by the UI
2015-06-14 02:03:39 +02:00
Laurent Destailleur
f67af6dac5
Merge pull request #3026 from marcosgdf/bug-2891
...
FIX Close bug #2891 Category hooks do not work
2015-06-14 01:40:12 +02:00
Marcos García de La Fuente
ea625628ce
Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers
2015-06-13 03:39:06 +02:00
Marcos García de La Fuente
1215502927
Fix Close bug #2814 JPEG photos are not displayed in Product photos page
2015-06-13 03:11:17 +02:00
Marcos García de La Fuente
f9574fa458
FIX Close #2835 Customer prices of a product shows incorrect history order
2015-06-12 19:05:08 +02:00
Marcos García de La Fuente
2051a66cd7
FIX Close #2837 Product list table column header does not match column body
2015-06-12 18:46:05 +02:00
Marcos García de La Fuente
0335892521
FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0
2015-06-12 18:31:49 +02:00
Marcos García de La Fuente
300cfd2293
FIX Close bug #2891 Category hooks do not work
2015-06-12 16:10:23 +02:00
Marcos García de La Fuente
87a00d6924
FIX Close bug #2976 : "Report" tab is the current tab but it is not marked as selected by the UI
2015-06-12 15:02:05 +02:00
Raphaël Doursenaud
d89955047b
FIX #3009 : Better filtering to prevent SQL injection
2015-06-11 10:37:30 +02:00
Laurent Destailleur
f9d85973aa
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-06-08 18:18:37 +02:00
Raphaël Doursenaud
08c9dd358d
FIX #2983 Load gravatar avatar images securely over HTTPS
2015-06-08 15:51:41 +02:00
Laurent Destailleur
3c8d54d55f
Merge pull request #2938 from FHenry/3.6
...
FIX : If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values)
2015-06-05 15:43:25 +02:00
Maxime Kohlhaas
f7493de50c
Fix : supplier order clone was buggy if notes contains apostrophe
2015-06-05 13:42:29 +02:00
jfefe
195a1b2708
FIX #2957 : missing $langs object for trigger
2015-06-04 18:10:29 +02:00
Florian HENRY
fb29fa486a
FIX : total amount in tpl linked object are not reset
2015-06-02 11:20:08 +02:00
Florian HENRY
bdaf83a653
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2015-06-02 08:42:13 +02:00
Florian HENRY
3f1613197e
FIX : If supplier invoice block linked element is display after other
...
block total HT amount is not reset to 0 and sum other block (like
customer orders values)
2015-06-02 08:41:42 +02:00
Laurent Destailleur
a60ab7dd29
Merge pull request #2912 from atm-ph/fix_36_reassort_target
...
FIX top links menu have target attribute with wrong value
2015-05-30 15:06:46 +02:00
Alexis Algoud
dd7febe2b9
replace test by getEntity()
2015-05-29 15:10:59 +02:00
Alexis Algoud
ab0f805044
Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into fix_multientity_num_check
2015-05-29 15:09:04 +02:00
phf
5a006d824e
FIX : top links menu have target attribute with wrong value
2015-05-27 10:52:23 +02:00
Laurent Destailleur
a33809a526
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
2015-05-25 17:46:42 +02:00
Alexis Algoud
91885c9d6f
FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)
2015-05-22 17:22:57 +02:00
Laurent Destailleur
0b40502878
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2015-05-22 17:14:53 +02:00
Laurent Destailleur
dcc197eb6b
Fix bug debian 786479
2015-05-22 17:13:32 +02:00
Laurent Destailleur
2f5d1f5965
Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal
...
Fix email cc in selectlist on propal/bill
2015-05-22 16:56:53 +02:00
Laurent Destailleur
4de46892d1
Merge pull request #2872 from atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro
...
FIX button create payment hide if tax amount is less than 1
2015-05-22 16:53:49 +02:00
Maxime Kohlhaas
ff6708840d
Fix : facturestats was not filtering on invoice type
2015-05-22 09:23:28 +02:00
Alexis Algoud
81a919e8a3
round to price2num
2015-05-22 09:05:38 +02:00
Alexis Algoud
9184b08f94
FIX button create payment hide if tax amount is less than 1
2015-05-21 16:51:21 +02:00
Alexis Algoud
bc672c2c23
FIX event for restricted user was restricted if company null
2015-05-21 11:49:10 +02:00
Raphaël Doursenaud
a7f6bbd316
Properly escape untrusted data to prevent HTML injection.
...
First pass for #2857
2015-05-20 17:34:00 +02:00
Francis Appels
40ef5737fc
Fix: SQL error in facturestats on no view rights
...
table alias sc must be available when user has no rights to view
customers. see where defenition line 80
2015-05-19 16:34:21 +02:00
Alexis Algoud
a4031a3680
if contact in sellist, it's an Id
2015-05-18 18:33:17 +02:00
Laurent Destailleur
cabbb9e421
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2015-05-16 16:49:03 +02:00
Laurent Destailleur
1d8a3809f0
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2015-05-16 15:27:18 +02:00
Laurent Destailleur
80943111cc
Prepare 3.5.7
2015-05-16 15:26:34 +02:00
Alexis Algoud
3dc5ffa871
FIX send mail, copy sendto don't read the list of contact
2015-05-13 18:05:26 +02:00
Marcos García de La Fuente
190f12c4c4
Merge branch '3.5' into bug-2757
...
Conflicts:
ChangeLog
2015-05-12 10:16:48 +02:00
Marcos García de La Fuente
ea7eb241e3
Close bug #2757 Deleting product category photo gives "Forbidden access" error
2015-05-12 10:15:43 +02:00
Laurent Destailleur
973e2253bf
Merge pull request #2797 from hregis/3.6
...
Fix: add $object for use with triggers
2015-05-12 00:14:22 +02:00
Laurent Destailleur
2a486f471b
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/product/class/product.class.php
2015-05-11 23:39:45 +02:00
Marcos García de La Fuente
f6616deef3
Removed debugging function
2015-05-10 01:28:40 +02:00
Marcos García de La Fuente
f8e8b39ff2
FIX #2758 Product::update sets product note to "null" when $prod->note is null
2015-05-10 01:27:28 +02:00
Florian HENRY
5395465cfd
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2015-05-07 17:24:51 +02:00
Florian HENRY
29f562460a
fix [ bug #1926 ] [contract] Wrong Rights Checked
2015-05-07 17:23:32 +02:00
Regis Houssin
9a32d7ec2f
Fix: add $object for use with triggers
2015-05-07 12:02:24 +02:00
Maxime Kohlhaas
42455f771a
Missing comments
2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
d2603d5308
Fix : shipment was not considered as billed after classifybilled function
2015-05-06 12:39:10 +02:00
Maxime Kohlhaas
b203263e91
Fix : shipment PDF was not using generation params
2015-05-06 12:16: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
f1032baaab
Allow exporting projects without a third party
...
FIX #2729
2015-04-30 11:48:32 +02:00
Laurent Destailleur
43efd76b24
Fix remove warnings
2015-04-29 23:39:34 +02:00
Laurent Destailleur
290856db1c
Fix remove warning
2015-04-29 22:37:04 +02:00
Juanjo Menent
cfaaf56428
Change bugtracker to github in all maintened versions
2015-04-27 20:34:26 +02:00
Maxime Kohlhaas
5a66e1f98a
Fix : include facture class for outstanding bill
2015-04-19 00:26:05 +02:00
Laurent Destailleur
ab77158757
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/expedition/fiche.php
2015-04-18 23:55:17 +02:00
Laurent Destailleur
ed6abb0f79
Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2576
...
Conflicts:
ChangeLog
2015-04-18 20:56:27 +02:00
Laurent Destailleur
b7cf0ded00
Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2577
...
Conflicts:
ChangeLog
2015-04-18 20:12:27 +02:00
Maxime Kohlhaas
7b035d3b5f
Fix : menu financial was not displayed when only supplier module is activated
2015-04-18 20:11:19 +02:00
Laurent Destailleur
9b69b64626
Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583
...
Conflicts:
ChangeLog
2015-04-18 20:10:06 +02:00
Laurent Destailleur
4201cf9f7f
Merge pull request #2638 from atm-maxime/fix_cust_outstanding
...
Fix cust outstanding
2015-04-18 18:56:23 +02:00
Maxime Kohlhaas
51522decf3
Fix : price in editkeyval function was forcing a price rounding
2015-04-18 18:33:46 +02:00
Maxime Kohlhaas
8b307aac56
Fix : customer outstanding was not calculated properly
2015-04-18 18:06:27 +02:00
Maxime Kohlhaas
e0af2feced
Fix : on impayees remain to pay did not include deposits
2015-04-18 18:06:02 +02:00
Maxime Kohlhaas
2b8efc302a
Fix : shipment model selection
2015-04-18 11:24:55 +02:00
Maxime Kohlhaas
3073aab48b
Fix : discount were not working anymore on supplier order and bill
2015-04-17 23:31:51 +02:00
Raphaël Doursenaud
54b8aa8a0b
Fixed typo in task export
...
Closes #2607 , #2609
2015-04-14 19:14:16 +02:00
Laurent Destailleur
c0ddfbfab7
Merge pull request #2597 from marcosgdf/bug-1906
...
Fixes for bugs #1906 and #1905
2015-04-13 01:04:23 +02:00
Marcos García de La Fuente
8f0c41dbd2
Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
2015-04-12 22:02:25 +02:00
Marcos García de La Fuente
6173706531
Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
2015-04-12 21:55:20 +02:00
Marcos García de La Fuente
9cfb295675
Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref
2015-04-12 21:05:26 +02:00
Marcos García de La Fuente
bbd01c0c8d
Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project
2015-04-12 20:59:58 +02:00
Marcos García de La Fuente
728b64e334
Fix Bug #2583 : Unable to create a bank transfer with localized numbers
2015-04-12 20:24:22 +02:00
aspangaro
1f5ca497d3
Bug: Untranslated table header in /compta/bank/search.php
2015-04-09 20:50:19 +02:00
braito4
914b324a67
minor bug drag and drop total line in tasks list
2015-04-09 10:37:54 +02:00
Laurent Destailleur
bb83eb0f68
Merge pull request #2561 from frederic34/patch-5
...
Fix #2559 Bug: Untranslated "Total" in Bank module
2015-04-07 23:50:17 +02:00
Juanjo Menent
9d8cb459f1
Fix: Bad permission assignments for stock movements actions
2015-04-07 20:28:45 +02:00
Juanjo Menent
35a6ed90a0
Solves #2542 Bug: Contracts store localtax preferences
2015-04-07 20:02:12 +02:00
Juanjo Menent
345b609ff0
Closes #2545 Bug: Missing object_margin.png in Amarok theme
2015-04-07 18:41:40 +02:00
Frédéric FRANCE
06c749942a
Update index.php
2015-04-07 18:40:19 +02:00
Frédéric FRANCE
7a2942684c
Fix #2559 Bug: Untranslated "Total" in Bank module
2015-04-07 12:45:25 +02:00
Laurent Destailleur
a42eb7b787
Merge branch 'bug-2535' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2535
...
Conflicts:
ChangeLog
2015-04-06 12:52:33 +02:00
Laurent Destailleur
8ce66aad79
Merge branch 'bug-2534' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2534
...
Conflicts:
ChangeLog
2015-04-06 12:48:55 +02:00
Laurent Destailleur
d8b50722f3
Merge pull request #2548 from marcosgdf/bug-2540
...
Close #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty
2015-04-06 12:41:38 +02:00
Laurent Destailleur
f9608bf41d
Merge pull request #2547 from marcosgdf/bug-2543
...
Closes #2543 : Untranslated "Contract" origin string when creating an invoice from a contract
2015-04-06 12:38:54 +02:00
Marcos García de La Fuente
5c8e92d52a
Closes #2535 Bug: Untranslated string in "Linked objects" page of a project
2015-04-04 17:52:05 +02:00
Marcos García de La Fuente
50091dfe8b
Closes #2534 SQL error when editing a supplier invoice line
2015-04-04 17:44:52 +02:00
Marcos García de La Fuente
611406b75e
Closes #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty
2015-04-04 17:34:06 +02:00
Marcos García de La Fuente
65f4a818d4
Merge branch '3.6' into bug-2543
2015-04-04 17:29:17 +02:00
Marcos García de La Fuente
40860a84d1
Closes #2543 : Untranslated "Contract" origin string when creating an invoice from a contract
2015-04-04 17:28:24 +02:00
Florian HENRY
092dd38851
FIX : [ bug #1916 ] problème d'icone pour l'état "clos" sur les projets
2015-04-03 15:33:41 +02:00
Laurent Destailleur
f38212f20e
Merge pull request #2508 from FHenry/3.6
...
FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a specific year
2015-04-02 11:22:18 +02:00
Florian HENRY
104bbfdc1c
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2015-03-30 19:14:49 +02:00
Florian HENRY
65ec02bae1
FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a
...
specific year
2015-03-30 19:13:55 +02:00
Laurent Destailleur
fd8d09c8c0
Fix avoid warning
2015-03-29 17:53:05 +02:00
Laurent Destailleur
d0e4d8046b
Merge pull request #2480 from marcosgdf/minor-2
...
Corrected search box alignment in Customer orders list
2015-03-27 01:09:06 +01:00