Laurent Destailleur
|
eaa7fe5d14
|
Removed deprecated code
|
2018-12-08 11:41:55 +01:00 |
|
Laurent Destailleur
|
d2f0c87d8f
|
FIX Removed not use table
|
2018-12-08 11:41:08 +01:00 |
|
Maxime Kohlhaas
|
550df138a6
|
Fix unexistant fields
|
2018-12-07 12:19:50 +01:00 |
|
fappels
|
e2727f6d91
|
Fix issue #10186 no display of stock per batch series.
|
2018-12-06 21:43:10 +01:00 |
|
Laurent Destailleur
|
5ce26bae1b
|
Fix form of bank info for CH
|
2018-12-04 22:01:35 +01:00 |
|
Laurent Destailleur
|
f142238817
|
Fix missing field canvas
|
2018-12-04 21:25:59 +01:00 |
|
Laurent Destailleur
|
8e333c3feb
|
Standardize code
|
2018-12-04 14:54:58 +01:00 |
|
Laurent Destailleur
|
d80baaea69
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2018-12-04 14:29:47 +01:00 |
|
Laurent Destailleur
|
779d33cf02
|
Merge pull request #10085 from fmarcet/7.0
FIX Lines are not inserted correctly if VAT have code
|
2018-12-04 13:55:57 +01:00 |
|
Laurent Destailleur
|
b67ed87103
|
Merge pull request #10166 from atm-maxime/fix_pdf_footer
Fix pdf footer height for all documents
|
2018-12-04 13:35:11 +01:00 |
|
Laurent Destailleur
|
5061a9b0c2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
|
2018-12-04 13:17:25 +01:00 |
|
Laurent Destailleur
|
347384734d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
|
2018-12-04 13:15:32 +01:00 |
|
Ferran Marcet
|
602986ced8
|
Merge remote-tracking branch 'origin/7.0' into 7.0
# Conflicts:
# htdocs/comm/propal/class/propal.class.php
# htdocs/commande/class/commande.class.php
# htdocs/expensereport/class/expensereport.class.php
# htdocs/fourn/class/fournisseur.commande.class.php
|
2018-12-03 12:33:18 +01:00 |
|
Ferran Marcet
|
7247b14bd9
|
FIX Lines are not inserted correctly if VAT have code
|
2018-12-03 12:28:17 +01:00 |
|
Ferran Marcet
|
135a94dfed
|
Merge branch '7.0up' into 7.0
|
2018-12-03 11:59:46 +01:00 |
|
Ferran Marcet
|
8312d57d16
|
FIX Lines are not inserted correctly if VAT have code
|
2018-12-03 11:58:39 +01:00 |
|
Maxime Kohlhaas
|
8fea6338e1
|
Fix #6565
Fix pdf footer height for all documents
|
2018-12-02 18:51:49 +01:00 |
|
Maxime Kohlhaas
|
42c97cf7d5
|
Fix #6610
|
2018-12-02 17:59:11 +01:00 |
|
Laurent Destailleur
|
07425e4e19
|
Merge pull request #10156 from grandoc/7.0_bug
FIX #3234
|
2018-12-02 17:06:06 +01:00 |
|
Philippe GRAND
|
8ec2bac36a
|
FIX #3234
|
2018-12-02 10:02:05 +01:00 |
|
Maxime Kohlhaas
|
5e2f3a53c9
|
Fix expense report in ecm auto dir
|
2018-12-01 19:39:00 +01:00 |
|
Laurent Destailleur
|
cb9ada2119
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
|
2018-12-01 18:19:45 +01:00 |
|
Laurent Destailleur
|
a49a083629
|
Merge pull request #10142 from atm-maxime/fix_import_fk_dept
Fix add missing fk_department and fk_pays in contact/bank imports
|
2018-12-01 17:14:27 +01:00 |
|
Laurent Destailleur
|
e30bee50a2
|
Merge pull request #10139 from atm-john/fix_#8741
FIX #8741
|
2018-12-01 17:12:55 +01:00 |
|
Maxime Kohlhaas
|
13806124b2
|
Fix add missing fk_department and fk_pays in contact/bank imports
|
2018-12-01 17:11:04 +01:00 |
|
ATM John BOTELLA
|
474228cbd6
|
FIX #8741
|
2018-12-01 17:01:11 +01:00 |
|
florian HENRY
|
6236f727c9
|
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964
|
2018-12-01 16:51:51 +01:00 |
|
florian HENRY
|
c422904b99
|
fix #9964
|
2018-12-01 16:51:40 +01:00 |
|
Inovea Conseil
|
18281d9d43
|
FIX #6580
FIX #6580
|
2018-12-01 16:48:50 +01:00 |
|
Laurent Destailleur
|
e4bc9f8f87
|
Merge pull request #10136 from grandoc/8.0
fix :#9967
|
2018-12-01 16:45:37 +01:00 |
|
Maxime Kohlhaas
|
748dd12e4d
|
Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model
FIX : Select first mail model by default
|
2018-12-01 16:39:22 +01:00 |
|
Philippe GRAND
|
bbf3b3baac
|
fix :#9967
|
2018-12-01 16:27:14 +01:00 |
|
florian HENRY
|
c320dcd161
|
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9999
|
2018-12-01 16:24:20 +01:00 |
|
florian HENRY
|
589511f38c
|
fix #9999
|
2018-12-01 16:23:40 +01:00 |
|
Frédéric FRANCE
|
61322b9ce2
|
devcamp 2018 fix #9642
|
2018-12-01 16:19:54 +01:00 |
|
Inovea Conseil
|
0ba5fda3da
|
Update price.php
|
2018-12-01 16:11:49 +01:00 |
|
Inovea Conseil
|
8964ec7ea1
|
Fix #9572
Fix #9572
|
2018-12-01 15:58:37 +01:00 |
|
Juanjo Menent
|
7d4553179d
|
Fix #9929
|
2018-12-01 15:48:46 +01:00 |
|
Laurent Destailleur
|
305ab85f5d
|
Merge pull request #10114 from frederic34/patch-17
Update 6.0.0-7.0.0.sql #8723
|
2018-12-01 14:54:31 +01:00 |
|
Juanjo Menent
|
6104d16b08
|
Merge pull request #10117 from atm-maxime/fix_pdf_contract
Fix pdf strato for contract with multipage
|
2018-12-01 11:14:38 +01:00 |
|
Juanjo Menent
|
1c04c2b5f4
|
Fix #10097
|
2018-12-01 10:38:40 +01:00 |
|
Maxime Kohlhaas
|
2b5bf0e2dd
|
Fix pdf strato for contract with multipage
|
2018-12-01 01:07:15 +01:00 |
|
florian HENRY
|
38059ed60d
|
fix #10006
|
2018-12-01 00:39:37 +01:00 |
|
Frédéric FRANCE
|
335327827d
|
Update 6.0.0-7.0.0.sql
|
2018-12-01 00:34:17 +01:00 |
|
Frédéric FRANCE
|
0270da7d8c
|
Update 5.0.0-6.0.0.sql
|
2018-12-01 00:28:58 +01:00 |
|
Frédéric FRANCE
|
6ab12b5911
|
Update llx_paiementfourn.sql
|
2018-12-01 00:26:51 +01:00 |
|
Juanjo Menent
|
d1df592c7e
|
Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen
Fix #9074
|
2018-11-30 23:57:49 +01:00 |
|
Juanjo Menent
|
859d6c4401
|
Merge pull request #10109 from atm-maxime/fix_dupl_code
Fix #9070
|
2018-11-30 23:57:32 +01:00 |
|
florian HENRY
|
7a182c7880
|
fix #10069
|
2018-11-30 23:25:44 +01:00 |
|
Maxime Kohlhaas
|
e8a02a971d
|
Fix #9074
|
2018-11-30 23:05:12 +01:00 |
|
Maxime Kohlhaas
|
7585461486
|
Fix #9070
|
2018-11-30 22:16:17 +01:00 |
|
Maxime Kohlhaas
|
5dcb3d2a1f
|
Fix extrafields in import tool
|
2018-11-30 19:23:05 +01:00 |
|
Laurent Destailleur
|
28902e18ee
|
Fix for screen with antiblue system
|
2018-11-28 16:32:53 +01:00 |
|
ptibogxiv
|
21f4d474b4
|
Fix sql don.class.php
|
2018-11-28 16:11:10 +01:00 |
|
Laurent Destailleur
|
0373cad2cd
|
FIX Method setValid not found
|
2018-11-28 16:11:00 +01:00 |
|
Marc de Lima Lucio
|
c13cc5d697
|
FIX: form actions: select_type_actions could be too small + bad init
|
2018-11-28 15:46:27 +01:00 |
|
Juanjo Menent
|
2f61d29b06
|
FIX: #10080 Supplier translations are in english
|
2018-11-28 10:40:45 +01:00 |
|
Ferran Marcet
|
9d6c95e8a9
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-11-27 11:39:07 +01:00 |
|
Ferran Marcet
|
d8537a3c76
|
FIX Lines are not inserted correctly if VAT have code
|
2018-11-27 11:36:31 +01:00 |
|
Laurent Destailleur
|
b5c136bc32
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-26 23:02:23 +01:00 |
|
Laurent Destailleur
|
653b99cb33
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-26 23:02:07 +01:00 |
|
Laurent Destailleur
|
ecb6ea9151
|
Merge pull request #10058 from frederic34/patch-2
correct link and avoid warning in resource list
|
2018-11-24 11:17:56 +01:00 |
|
fappels
|
322ce410d7
|
Add missing paid field in fetch sql
|
2018-11-23 09:42:43 +01:00 |
|
Laurent Destailleur
|
1d4c756783
|
FIX Remote ip detection was wrong with proxy (example: cloudflare)
|
2018-11-22 11:44:37 +01:00 |
|
Laurent Destailleur
|
084516b885
|
Fix ip detection of geoip
|
2018-11-21 15:11:57 +01:00 |
|
Frédéric FRANCE
|
e8cac0df35
|
correct link and avoid warning in resource list
|
2018-11-21 14:06:06 +01:00 |
|
Laurent Destailleur
|
25ee999d27
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-19 20:05:32 +01:00 |
|
Laurent Destailleur
|
20dbbaf5cc
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-19 20:05:04 +01:00 |
|
Laurent Destailleur
|
fb6aa01207
|
FIX #10030 better german chart
|
2018-11-19 20:04:31 +01:00 |
|
Laurent Destailleur
|
8191df4857
|
Merge pull request #9962 from atm-john/fix_extrafield_view
FIX hidden extrafield
|
2018-11-19 18:37:18 +01:00 |
|
Laurent Destailleur
|
8535844737
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-19 18:27:00 +01:00 |
|
Laurent Destailleur
|
1931fd33eb
|
Merge pull request #10041 from atm-ph/fix_8.0_optional_param
Fix new params has been added not optional
|
2018-11-19 18:26:21 +01:00 |
|
Laurent Destailleur
|
bd8856b988
|
Merge pull request #10033 from frederic34/patch-9
Update CMailFile.class.php
|
2018-11-19 18:20:20 +01:00 |
|
Laurent Destailleur
|
7a3f088fcb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-19 18:19:11 +01:00 |
|
Laurent Destailleur
|
77bc1c4313
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/actions_massactions.inc.php
|
2018-11-19 18:18:43 +01:00 |
|
Laurent Destailleur
|
4bedeabc5b
|
FIX #10036
|
2018-11-19 18:02:29 +01:00 |
|
gauthier
|
ecdfa5219b
|
FIX : We want to be able to send PDF of paid invoices
|
2018-11-19 17:31:45 +01:00 |
|
Laurent Destailleur
|
2d09008610
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-19 15:55:59 +01:00 |
|
Laurent Destailleur
|
f85ab8d0a6
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/card.php
|
2018-11-19 15:55:41 +01:00 |
|
atm-ph
|
129034ba76
|
Fix new params has been added not optional
|
2018-11-19 15:46:30 +01:00 |
|
florian HENRY
|
dc2f1e9812
|
fix list agenda extrafield visibility
|
2018-11-19 11:25:48 +01:00 |
|
Frédéric FRANCE
|
30b1db34cd
|
Update CMailFile.class.php
|
2018-11-17 11:33:01 +01:00 |
|
Laurent Destailleur
|
f2bbb54b8f
|
Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist
FIX : filter on product category doesn't work
|
2018-11-15 16:44:40 +01:00 |
|
Laurent Destailleur
|
f3228dc4f8
|
Merge pull request #10010 from atm-john/Fix_cat_photo_upload
Fix event message on upload category picture fail
|
2018-11-15 16:43:59 +01:00 |
|
Laurent Destailleur
|
3ca45e0e40
|
Fix double dot in sql filename
|
2018-11-15 10:59:55 +01:00 |
|
gauthier
|
85dd0ec2dd
|
FIX : filter on product category doesn't work
|
2018-11-13 15:24:53 +01:00 |
|
John BOTELLA
|
c6cf748ba7
|
Fix envent message on upload category picture
|
2018-11-13 14:44:10 +01:00 |
|
John BOTELLA
|
500bb7bc96
|
best conditions testing
|
2018-11-13 10:20:34 +01:00 |
|
gauthier
|
f404cae546
|
FIX : Same on customer card
|
2018-11-12 16:04:42 +01:00 |
|
gauthier
|
66ea8bbe87
|
FIX : fourn payment modes musn't be available on customer docs
|
2018-11-12 15:58:41 +01:00 |
|
tarrsalah
|
5eb897e049
|
FIX sql query performance on list_qualified_avoir_supplier_invoices.
|
2018-11-12 12:11:40 +01:00 |
|
Laurent Destailleur
|
5ec602cafa
|
Merge pull request #9983 from hregis/8.0_bug
FIX missing field "visible"
|
2018-11-10 12:19:35 +01:00 |
|
Regis Houssin
|
ee06f36f4c
|
FIX missing field "visible"
|
2018-11-09 11:36:20 +01:00 |
|
Regis Houssin
|
5d1d77a966
|
FIX missing action "edit" for the hook
|
2018-11-09 10:32:08 +01:00 |
|
Laurent Destailleur
|
8a89da25c6
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/margin/tabs/thirdpartyMargins.php
|
2018-11-08 20:18:13 +01:00 |
|
Laurent Destailleur
|
400b48bd9b
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-08 20:14:59 +01:00 |
|
Laurent Destailleur
|
9012f6ecc5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-08 20:14:40 +01:00 |
|
Laurent Destailleur
|
1b8649be6f
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-08 20:14:02 +01:00 |
|
Laurent Destailleur
|
d6bd325f70
|
Merge pull request #9980 from atm-john/fix_supplier_order_list_socid
FIX supplier order list keep socid
|
2018-11-08 20:13:52 +01:00 |
|
Laurent Destailleur
|
9a31a61c9d
|
FIX #9971
|
2018-11-08 20:05:01 +01:00 |
|