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 |
|
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
|
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 |
|
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 |
|
Laurent Destailleur
|
0668f90e14
|
Merge pull request #10146 from atm-maxime/fix_ecm_expensereport
Fix expense report in ecm auto dir
|
2018-12-01 23:02:09 +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 |
|
Laurent Destailleur
|
b41e0a40e7
|
Merge pull request #10138 from inoveaconseil/patch-4
FIX #6580
|
2018-12-01 16:56:31 +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 |
|
Laurent Destailleur
|
3d09b05338
|
Merge pull request #10135 from atm-florian/8.0_fix9999
fix #9999
|
2018-12-01 16:31:02 +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 |
|
Laurent Destailleur
|
3ea69cb1f1
|
Merge pull request #10130 from inoveaconseil/patch-3
Fix #9572
|
2018-12-01 16:22:38 +01:00 |
|
Laurent Destailleur
|
508cb459eb
|
Merge pull request #10134 from frederic34/patch-18
devcamp 2018 fix #9642
|
2018-12-01 16:21:30 +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 |
|
Laurent Destailleur
|
3b4ee295f3
|
Merge pull request #10129 from simnandez/8.0
Fix #9929
|
2018-12-01 15:58:38 +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
|
03a67cee99
|
Merge pull request #10113 from frederic34/patch-9
llx_paiementfourn.sql #8723
|
2018-12-01 14:54:57 +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 |
|
Laurent Destailleur
|
60610ca49d
|
Merge pull request #10119 from simnandez/8.0
Fix #10097
|
2018-12-01 14:48:39 +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 |
|
Juanjo Menent
|
163f67d600
|
Merge pull request #10115 from atm-florian/8.0
fix #10006
|
2018-12-01 08:57:23 +01:00 |
|
Maxime Kohlhaas
|
2b5bf0e2dd
|
Fix pdf strato for contract with multipage
|
2018-12-01 01:07:15 +01:00 |
|
florian HENRY
|
cddb6e0c47
|
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0
|
2018-12-01 00:40:12 +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
|
ace14434e9
|
Merge pull request #10111 from atm-florian/8.0
fix #10069
|
2018-11-30 23:58:16 +01:00 |
|