Commit Graph

68848 Commits

Author SHA1 Message Date
Laurent Destailleur
f8b0e535fa Code comment 2018-12-22 17:30:22 +01:00
Laurent Destailleur
2b088a73c1 FIX CVE-2018-19998 2018-12-22 17:16:08 +01:00
Laurent Destailleur
74e75a7e2b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-22 17:12:48 +01:00
Laurent Destailleur
bacd5110fb FIX CVE-2018-19995 and CVE-2018-19998 2018-12-22 17:12:38 +01:00
Laurent Destailleur
4b8be6ed64 FIX CVE-2018-19995 2018-12-22 17:08:55 +01:00
Laurent Destailleur
850b939ffd FIX CVE-2018-19994 2018-12-22 17:03:50 +01:00
Laurent Destailleur
fc3fcc5455 FIX CVE-2018-19993 2018-12-22 16:59:30 +01:00
Laurent Destailleur
0f06e39d23 FIX CVE-2018-19992 2018-12-22 16:55:31 +01:00
Laurent Destailleur
707af49025 FIX Missing last month on vat report per month 2018-12-19 12:07:26 +01:00
Laurent Destailleur
4b7f373802 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-18 21:37:34 +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
Laurent Destailleur
f2318716ec FIX Error reported when creation of thirdparty from member fails 2018-12-18 21:27:16 +01:00
Laurent Destailleur
31d032d5d3 FIX Can't create a thirdparty from member if customer code is mandatory. 2018-12-18 21:00:06 +01:00
Laurent Destailleur
2e6a41228f Fix removing constant no more required 2018-12-18 20:49:48 +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
af4405c669 FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE 2018-12-16 20:29:08 +01:00
Laurent Destailleur
d8b5cd4bdf Remove white lines 2018-12-16 19:31:59 +01:00
Laurent Destailleur
efb88292dd Clean code 2018-12-16 19:30:54 +01:00
Laurent Destailleur
003c463ee4 FIX Can't delete a line of minimal stock per warehouse 2018-12-16 19:23:53 +01:00
Laurent Destailleur
20d24f2feb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-16 18:45:30 +01:00
Laurent Destailleur
2d05b7c790 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-16 18:45:13 +01:00
Laurent Destailleur
9b844df315 FIX Extrafields on shipment module 2018-12-16 18:44:58 +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
Laurent Destailleur
9558020ea3
Merge pull request #10233 from simnandez/8.0
FIX: Vendor translations are in english
2018-12-16 17:40:37 +01:00
Laurent Destailleur
cca3b4870a FIX CVE-2018-19799 2018-12-16 13:36:51 +01:00
Juanjo Menent
6ce0d3e279 FIX: Vendor translations are in english 2018-12-16 11:16:12 +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
Norbert Penel
0f3a063c91 Events are not linked to products
when created from a product card, the events are not linked to the product
2018-12-15 15:57:15 +01:00
Laurent Destailleur
72b44a9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-15 14:05:48 +01:00
Laurent Destailleur
e069da69ba Revert "Fix screen size fall"
This reverts commit abb6b41f91.
2018-12-15 12:35:37 +01:00
Laurent Destailleur
dbe5d285e8
Merge pull request #9965 from atm-john/fix_responsive
FIX screen size fall
2018-12-15 12:33:35 +01:00
Laurent Destailleur
8e08ea5c14
Merge pull request #10143 from atm-florian/8.0_fix9964
8.0 fix #9964
2018-12-14 19:40:53 +01:00
Laurent Destailleur
063e589a1b
Merge branch '8.0' into 8.0_fix9964 2018-12-14 19:37:40 +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
ea35e45f76
Merge pull request #10197 from atm-maxime/fix_import_bank
Fix unexistant fields
2018-12-14 17:40:45 +01:00
PMickael
37daface19 [Accounting][VAT] Fix balance should be based on period
[Accounting][VAT] Fix balance should be based on period
2018-12-14 17:23:45 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
735d04bd2a Merge 2018-12-13 20:48:07 +01:00
Laurent Destailleur
dcb43214d6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-13 20:46:05 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Laurent Destailleur
603656c7de
Merge pull request #10219 from simnandez/8.0
FIX: #10218 Bad redirection after deleting a user or group
2018-12-13 20:02:53 +01:00
Laurent Destailleur
4413b2e886
Merge pull request #10215 from atm-quentin/8.0_FIX_if_qty_is_0
FIX if qty is 0
2018-12-13 19:56:38 +01:00
Laurent Destailleur
6ad106d14a
Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
florian HENRY
2e57a8be51 better fix 2018-12-13 12:37:40 +01:00
florian HENRY
56923caeec Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-13 12:34:39 +01:00
Juanjo Menent
22c34bd656 Fix: MenuBankCash Translation is in english in es_ES 2018-12-12 12:09:07 +01:00