Laurent Destailleur
|
6becdc8af4
|
Fix missing substitution of ID
|
2019-01-16 16:34:36 +01:00 |
|
Laurent Destailleur
|
9a6c3ac3df
|
FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER
|
2019-01-08 14:05:07 +01:00 |
|
Laurent Destailleur
|
8e3df45cbf
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/holiday/define_holiday.php
|
2019-01-08 01:46:03 +01:00 |
|
Laurent Destailleur
|
3d578cab28
|
Merge pull request #10308 from EuskalMoneta/7.0
FIX Civility not saved when creating a member.
|
2019-01-07 14:10:00 +01:00 |
|
Xebax
|
fbb1b344d1
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2019-01-06 13:44:13 +01:00 |
|
Xebax
|
2c496d2ac0
|
FIX Civility not saved when creating a member.
|
2019-01-06 13:42:41 +01:00 |
|
Juanjo Menent
|
e8424ebec3
|
Merge pull request #10304 from simnandez/7.0
Change to 7.0.6
|
2019-01-05 14:47:24 +01:00 |
|
Juanjo Menent
|
74442911a7
|
Change to 7.0.6
|
2019-01-05 14:45:23 +01:00 |
|
Juanjo Menent
|
709d173669
|
Merge pull request #10303 from simnandez/7.0
Fix #8152 and prepare 7.0.5
|
2019-01-05 14:00:02 +01:00 |
|
Juanjo Menent
|
96967100ba
|
Prepare 7.0.5
|
2019-01-05 13:35:32 +01:00 |
|
Juanjo Menent
|
7908550937
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2019-01-05 13:05:50 +01:00 |
|
Juanjo Menent
|
61fbfaf356
|
Merge pull request #10298 from fmarcet/7.0
FIX: Can't generate invoice pdf
|
2019-01-05 13:02:58 +01:00 |
|
Ferran Marcet
|
f3dd875fc7
|
FIX: Can't generate invoice pdf
|
2019-01-04 12:00:39 +01:00 |
|
Ferran Marcet
|
4694af0488
|
FIX: Can't generate invoice pdf
|
2019-01-04 11:45:02 +01:00 |
|
Ferran Marcet
|
3e358c90b3
|
Merge branch '7.0up' into 7.0
|
2019-01-04 11:32:19 +01:00 |
|
Ferran Marcet
|
15cc45b8ae
|
FIX: Can't generate invoice pdf
|
2019-01-04 10:52:10 +01:00 |
|
Laurent Destailleur
|
66b2a82be6
|
Merge pull request #10292 from atm-gauthier/6.0_fix_holidays
FIX : holidays get natural_search if search params are set only
|
2019-01-02 20:04:39 +01:00 |
|
ldestailleur
|
8645a7f524
|
FIX Interface regression for bind people. Fix option
MAIN_OPTIMIZEFORTEXTBROWSER
|
2019-01-02 18:58:45 +01:00 |
|
gauthier
|
fc3da0f5be
|
FIX : holidays get natural_search if search params are set only
|
2019-01-02 10:02:30 +01:00 |
|
Juanjo Menent
|
cf64053fa5
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-12-29 15:07:09 +01:00 |
|
Laurent Destailleur
|
b76c45e8d0
|
Merge pull request #10264 from hregis/7.0_price
FIX avoid Class 'AdherentType' not found
|
2018-12-22 18:16:40 +01:00 |
|
Regis Houssin
|
09ce84ca93
|
FIX avoid Class 'AdherentType' not found
|
2018-12-21 16:38:02 +01:00 |
|
Laurent Destailleur
|
ed13f7b729
|
Merge pull request #10252 from ATM-Nicolas/fix_call_to_update_price
FIX : Function updatePrice with wrong parameters
|
2018-12-19 13:02:00 +01:00 |
|
Laurent Destailleur
|
2978522006
|
Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change
FIX: contact/address tab issue when changing company
|
2018-12-19 12:59:32 +01:00 |
|
Laurent Destailleur
|
fb8c3f01a4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/modules/project/doc/pdf_baleine.modules.php
htdocs/core/modules/project/doc/pdf_beluga.modules.php
|
2018-12-18 21:35:30 +01:00 |
|
Laurent Destailleur
|
4b6ae9d424
|
FIX Error reported when creation of thirdparty from member fails
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
|
2018-12-18 21:32:41 +01:00 |
|
Laurent Destailleur
|
b8429c607e
|
FIX Can't create a thirdparty from member if customer code is mandatory.
|
2018-12-18 21:29:53 +01:00 |
|
Laurent Destailleur
|
6851232314
|
Fix removing constant no more required
|
2018-12-18 21:29:36 +01:00 |
|
ATM-Nicolas
|
96144e18f1
|
FIX : Function updatePrice with wrong parameters
|
2018-12-18 15:27:32 +01:00 |
|
Marc de Lima Lucio
|
7e2eca661b
|
FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account
|
2018-12-18 09:40:58 +01:00 |
|
Laurent Destailleur
|
051853fc00
|
Merge pull request #10246 from atm-ph/fix_7.0_user_attached_files
Fix attached files from user mail form don't work
|
2018-12-17 21:11:43 +01:00 |
|
atm-ph
|
1aadcc50f1
|
Fix attached files from user mail form don't work
|
2018-12-17 15:48:27 +01:00 |
|
Laurent Destailleur
|
6275355cd5
|
Merge pull request #10234 from aspangaro/7.0_alert_bank
Fix: Accountancy - remove alert on bank account configuration when bank account is closed
|
2018-12-16 17:41:23 +01:00 |
|
Juanjo Menent
|
a61677dcc6
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-12-16 11:31:06 +01:00 |
|
Alexandre SPANGARO
|
6eb9013430
|
Fix: Accountancy - remove alert on bank account configuration when bank account is closed
|
2018-12-16 06:36:55 +01:00 |
|
Laurent Destailleur
|
45115a9590
|
Merge pull request #10191 from fappels/7.0_fix_issue#10186
Fix issue #10186 no display of stock per batch series.
|
2018-12-14 19:34:11 +01:00 |
|
Laurent Destailleur
|
42d4cf9992
|
Fix sql
|
2018-12-10 10:17:54 +01:00 |
|
Juanjo Menent
|
531cfe791d
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2018-12-07 11:34:42 +01:00 |
|
fappels
|
e2727f6d91
|
Fix issue #10186 no display of stock per batch series.
|
2018-12-06 21:43:10 +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
|
6d57c1b5f9
|
Merge pull request #10165 from atm-maxime/fix_user_noperm
Fix #6610
|
2018-12-04 13:34:11 +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 |
|