Commit Graph

73490 Commits

Author SHA1 Message Date
Laurent Destailleur
c96937d101
Merge pull request #13729 from simicar29/11.0-contrat
Clean line extrafields when deleting contrat
2020-04-24 15:16:29 +02:00
Frédéric FRANCE
1aafd4667b
fix countable php7 warning 2020-04-24 11:57:23 +02:00
stickler-ci
ababad540a Fixing style errors. 2020-04-23 17:29:52 +00:00
Laurent Destailleur
a90398af06
Merge pull request #13726 from simicar29/11.0-supplierproposal
Clean line extrafields when deleting supplier proposal
2020-04-23 19:27:39 +02:00
Laurent Destailleur
2fcb2ff19f
Merge pull request #13727 from simicar29/11.0-fichinter
Clean line extrafields when deleting fichinter
2020-04-23 19:27:22 +02:00
Marc Guenneugues
b4fbb86548 Clean line extrafields when deleting reception 2020-04-23 19:22:25 +02:00
Marc Guenneugues
3ea8d1895b Clean line extrafields when deleting expedition 2020-04-23 19:09:05 +02:00
stickler-ci
b8a4c0d83b Fixing style errors. 2020-04-23 17:02:57 +00:00
Marc Guenneugues
a70be95760 Clean line extrafields when deleting contrat 2020-04-23 19:00:47 +02:00
Laurent Destailleur
7f0e019c78
Merge pull request #13725 from simicar29/11.0-supplierorder
Clean line extrafields when deleting supplier order
2020-04-23 18:56:09 +02:00
stickler-ci
93735bf9cd Fixing style errors. 2020-04-23 16:55:36 +00:00
Marc Guenneugues
285f215acf Clean line extrafields when deleting fichinter 2020-04-23 18:52:45 +02:00
Laurent Destailleur
388e98fdf0
Merge pull request #13724 from simicar29/11.0-supplierinvoice
Clean line extrafields when deleting supplier invoice
2020-04-23 18:35:34 +02:00
Marc Guenneugues
ab5c2b1fd5 Clean line extrafields when deleting supplier proposal 2020-04-23 18:33:58 +02:00
Laurent Destailleur
922efaf49b
Merge pull request #13714 from simnandez/11.0
FIX: Error update SQL into stock reception
2020-04-23 18:31:11 +02:00
Laurent Destailleur
02c5530e1f
Update mouvementstock.class.php 2020-04-23 18:31:01 +02:00
stickler-ci
4b58213e5b Fixing style errors. 2020-04-23 16:29:36 +00:00
Marc Guenneugues
64d877bc7b Clean line extrafields when deleting supplier order 2020-04-23 18:27:06 +02:00
Laurent Destailleur
00e9ed1452
Merge pull request #13716 from atm-florian/11.0
fix: remove debug pring
2020-04-23 18:22:18 +02:00
stickler-ci
b5f48fb815 Fixing style errors. 2020-04-23 16:17:37 +00:00
Marc Guenneugues
039fe92209 Clean line extrafields when deleting supplier invoice 2020-04-23 18:14:56 +02:00
Laurent Destailleur
5edd8b1206
Merge pull request #13722 from simicar29/11.0-commande
Clean line extrafields when deleting order
2020-04-23 18:13:34 +02:00
Laurent Destailleur
c8a93437ff
Merge pull request #13721 from simicar29/11.0
Clean line extrafields when deleting invoice
2020-04-23 18:12:28 +02:00
Marc Guenneugues
94be1870ec Clean line extrafields when deleting proposal 2020-04-23 18:02:53 +02:00
Laurent Destailleur
1101c4e587 Fix trans 2020-04-23 18:01:04 +02:00
Laurent Destailleur
f7d4d78008 Fix error 500 2020-04-23 17:55:55 +02:00
Marc Guenneugues
be46b2062e Clean line extrafields when deleting order 2020-04-23 17:51:06 +02:00
Laurent Destailleur
cd1368cb71 Fix dispatch in ledger for various payment done in same account when
there is 2 different transaction in 2 different account (backport v12)
2020-04-23 17:10:40 +02:00
stickler-ci
2633e90890 Fixing style errors. 2020-04-23 15:03:14 +00:00
simicar29
ce94788dd9
Clean line extrafields when deleting recurring invoice
Delete extrafields recurring invoice lines when deleting parent object
Delete extrafields when deleting a recurring invoice line
2020-04-23 17:01:40 +02:00
stickler-ci
aebc04d30a Fixing style errors. 2020-04-23 14:33:11 +00:00
simicar29
b68e85703f
Clean line extrafields when deleting invoice
Delete extrafields invoice lines when deleting parent object (sql syntax ok for mariadb & pgsql)
Delete extrafields when deleting an invoice line
2020-04-23 16:29:22 +02:00
Laurent Destailleur
6819255b76 FIX #13650 2020-04-23 13:49:18 +02:00
florian HENRY
7972174787 remove debug pring 2020-04-23 13:44:23 +02:00
Laurent Destailleur
436362502c CSS 2020-04-23 13:41:51 +02:00
Laurent Destailleur
3a9add0e70 FIX #13663 2020-04-23 13:37:43 +02:00
Laurent Destailleur
e1129babbc Code comment 2020-04-23 12:44:30 +02:00
Laurent Destailleur
93278b2dca FIX #13713 2020-04-23 12:42:03 +02:00
Juanjo Menent
0999f5e6f2 FIX: Error update SQL into stock reception 2020-04-23 12:12:50 +02:00
Laurent Destailleur
de90f24bd4 Fix phpcs 2020-04-22 21:29:15 +02:00
Laurent Destailleur
6b8ff56c20 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/html.formother.class.php
2020-04-22 18:26:26 +02:00
Laurent Destailleur
80271cc852 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-22 18:24:00 +02:00
Laurent Destailleur
7bc8a70b0a FIX #13670 2020-04-22 18:23:48 +02:00
gauthier
43f4c5ac96 FIX : model export list must be sorted by label 2020-04-22 15:29:54 +02:00
Laurent Destailleur
c1d0cae24d
Merge pull request #13692 from hregis/11.0_bug
FIX missing fk_bank during export of suppliers invoices
2020-04-22 13:18:46 +02:00
Regis Houssin
f6f9ca48dd FIX missing fk_bank during export of suppliers invoices 2020-04-22 12:23:26 +02:00
florian HENRY
8be14060d6 fix: avoid php notice 2020-04-22 12:08:05 +02:00
Laurent Destailleur
11e9cc68b7
Merge pull request #13666 from frederic34/patch-1
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
2020-04-22 00:37:19 +02:00
Laurent Destailleur
e8ead1d924
Update expensereport.class.php 2020-04-22 00:36:46 +02:00
Laurent Paumier
cf05796f31 FIX #13027 expensereport status in generated pdf 2020-04-21 23:01:21 +02:00
Laurent Destailleur
f670a68b04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/mails.php
2020-04-21 18:29:50 +02:00
Laurent Destailleur
0b790ef327 Sync lang files 2020-04-21 18:18:07 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Laurent Destailleur
536ab95207 FIX: The "test smtp connectivity" failed on page to setup mass emailing
Conflicts:
	htdocs/admin/mails.php
2020-04-21 12:50:20 +02:00
Laurent Destailleur
f8ae5d9972 Fix Do not show value if null 2020-04-21 12:00:14 +02:00
Laurent Destailleur
ff5bf040e8 FIX text version of html emailing (removed the body style) 2020-04-21 11:19:27 +02:00
Frédéric FRANCE
f09fa5226a
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql 2020-04-20 18:43:05 +02:00
Laurent Destailleur
b8e68a5ef7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-20 16:06:31 +02:00
Laurent Destailleur
1e0e4d5d6d
Merge pull request #13653 from atm-maxime/fix_box_birthdays
Fix birthdays boxes and filter on month
2020-04-20 16:04:52 +02:00
gauthier
b72651fdfd FIX : we must export company mail address on contact vcard only if contact email address is empty 2020-04-20 15:59:44 +02:00
stickler-ci
27aeaaecb5 Fixing style errors. 2020-04-20 14:42:13 +02:00
Adrien Jacob
91fbccb594 [BUGFIX] Allow update of extra fields
This is to make supplier invoices consistent with other similar classes
2020-04-20 14:42:08 +02:00
Frédéric FRANCE
f546103c01 make dolistore happy again 2020-04-20 14:37:52 +02:00
Maxime Kohlhaas
817e16d652 Fix birthdays boxes and filter on month 2020-04-18 20:01:18 +02:00
Laurent Destailleur
ea60d0be63 FIX #13618 2020-04-17 10:27:38 +02:00
Laurent Destailleur
3e7f0b364e FIX #13611 2020-04-17 10:22:08 +02:00
Laurent Destailleur
3c29a7b8d8 Fix phpcs 2020-04-16 16:02:06 +02:00
Laurent Destailleur
01ec8693f2 Trans 2020-04-16 15:48:05 +02:00
Laurent Destailleur
855ac5467c FIX setup of suggested payment mode on proposals and orders 2020-04-16 15:40:16 +02:00
Laurent Destailleur
26022f062f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-16 15:24:23 +02:00
Laurent Destailleur
984fa0d5a0 Fix hidden const 2020-04-16 15:24:12 +02:00
Laurent Destailleur
7f746af10e
Merge pull request #13620 from atm-quentin/FIX_draftordered_replenish
FIX draftordered replenish virtual stock
2020-04-16 00:58:23 +02:00
Laurent Destailleur
b540bb29e0
Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status
FIX viewstatut to search status
2020-04-16 00:48:12 +02:00
Laurent Destailleur
86eaa78f1e FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
DOL_DOCUMENT_DIR.
2020-04-15 20:00:27 +02:00
atm-quentin
18fdf3573f FIX draftordered replenish virtual stock 2020-04-15 16:05:50 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
53ceef5b6a FIX XSS Vulnerability 2020-04-15 02:32:55 +02:00
Laurent Destailleur
c3b8949e2e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-04-14 21:57:20 +02:00
Laurent Destailleur
85bea5a7c4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-14 21:54:27 +02:00
Laurent Destailleur
110787d66a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-14 21:54:16 +02:00
Laurent Destailleur
d143bd8aec FIX #13589 missing price_level in import of thirdparties 2020-04-14 21:22:08 +02:00
Laurent Destailleur
f2704036cd FIX #13517 2020-04-13 16:00:41 +02:00
Laurent Destailleur
236898f4e7 FIX #13503 2020-04-13 14:55:37 +02:00
Laurent Destailleur
a72b262f5b FIx #13592
Conflicts:
	htdocs/compta/bank/line.php
2020-04-13 14:52:06 +02:00
Laurent Destailleur
f726fcdcd8 FIX #13593 2020-04-13 14:32:15 +02:00
Laurent Destailleur
1c6faf79a9 FIX #13595 2020-04-13 14:23:57 +02:00
Laurent Destailleur
384cfeccf6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-12 21:38:51 +02:00
Laurent Destailleur
46ccd61009 Fix phpcs 2020-04-12 21:38:23 +02:00
Laurent Destailleur
0f71ee1e49
Merge pull request #13563 from simicar29/11.0
FIX #7594 Expense report multi pagebreak
2020-04-12 18:19:23 +02:00
Laurent Destailleur
afbfd66ee9
Merge pull request #13581 from atm-maxime/fix_expedition_warning_count
Fix warning on shipment because of count func
2020-04-12 17:21:28 +02:00
Laurent Destailleur
8e6de35d7b
Merge pull request #13568 from atm-maxime/10.0
FIX #13535 : state in italian address
2020-04-12 17:03:24 +02:00
Laurent Destailleur
8e246f2a18 Prepare 11.0.4 2020-04-12 16:54:54 +02:00
Laurent Destailleur
acbbffdb7f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-12 16:54:15 +02:00
Laurent Destailleur
1cda760621 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:54:09 +02:00
Laurent Destailleur
94ae75c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-12 16:53:07 +02:00
Laurent Destailleur
eebf48b27c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2020-04-12 16:52:58 +02:00
Laurent Destailleur
2e27355dec FIX #13569 2020-04-12 16:51:35 +02:00
Laurent Destailleur
b1bae5f3dd
Merge pull request #13569 from tuxgasy/Fix_breaking_selectForFormsList
Keep compatibility with old object declaration
2020-04-12 16:48:08 +02:00
Laurent Destailleur
697043bbd3
Update html.form.class.php 2020-04-12 16:47:56 +02:00
Laurent Destailleur
acab0200a6
Update html.form.class.php 2020-04-12 16:46:21 +02:00
Laurent Destailleur
3cc68c6972
Merge pull request #13579 from atm-maxime/fix_variants_links
Fix #13576 : links on variants
2020-04-12 16:38:56 +02:00
Laurent Destailleur
a38e273ae8
Merge pull request #13583 from atm-maxime/fix_default_workdayhour
Fix #13468 setup working days and hours
2020-04-12 16:38:36 +02:00
Maxime Kohlhaas
20e684ec69 Fix #13468 setup working days and hours 2020-04-12 15:30:58 +02:00
Maxime Kohlhaas
3ca0d48b37 Fix warning on shipment because of count func 2020-04-12 10:45:30 +02:00
Maxime Kohlhaas
8bca68cfba Fix missing token on product composition 2020-04-12 10:39:16 +02:00
Maxime Kohlhaas
3f59ca6418 Fix #13576 : links on variants 2020-04-12 10:13:37 +02:00
Frédéric FRANCE
e2660fd31c
Update actioncomm.class.php 2020-04-11 22:38:28 +02:00
TuxGasy
fecfe2e3a1 Keep compatibility with old object declaration 2020-04-11 18:37:06 +02:00
Maxime Kohlhaas
f5ab957faf FIX #13535 : state in italian address 2020-04-11 17:56:23 +02:00
simicar29
9573f1289a
FIX #7594
This is a temptative fix of the bad "multi page break" in expense report
2020-04-11 13:42:37 +02:00
Laurent Destailleur
eb63350d55 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-11 01:09:36 +02:00
Laurent Destailleur
450b1761b1 Fix label 2020-04-11 01:09:26 +02:00
Laurent Destailleur
679b94dcaa
Merge pull request #13553 from atm-quentin/11_fix_checkbox_supplier_order
FIX missing selectedlines on supplier order
2020-04-10 20:04:24 +02:00
philazerty
63d41fa356
Update list.php
Bug #13519
2020-04-10 16:48:18 +02:00
gauthier
1f471d46eb FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report 2020-04-10 15:51:51 +02:00
atm-quentin
83f3c9ab6e use only 1 if 2020-04-10 12:09:18 +02:00
atm-quentin
28fa0e4e5d FIX missing selectedlines on supplier order but checkbox are displayed 2020-04-10 11:55:00 +02:00
andreubisquerra
4ac978303b
FIX TakePOS buying price 2020-04-10 08:36:16 +02:00
Laurent Destailleur
92cd0372db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-04-10 02:04:26 +02:00
Laurent Destailleur
a1e714f123 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-04-10 02:03:12 +02:00
Laurent Destailleur
c4d898e155 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-04-10 02:01:31 +02:00
Laurent Destailleur
6f4ff57612 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/supplier_proposal/list.php
2020-04-10 02:00:22 +02:00
Laurent Destailleur
5a366767fb Fix phpcs 2020-04-10 01:47:50 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
273443550e Fix list in warehouse 2020-04-10 01:21:59 +02:00
Laurent Destailleur
f7d1ce1e09 FIX Can use decimal value in virtual products 2020-04-10 00:26:09 +02:00
Laurent Destailleur
1ed8639653
Merge pull request #13532 from atm-quentin/11_fix_buyprice_extrafield_langfile_and_tooltip
FIX buyprice extrafield langfile and tooltip
2020-04-09 19:49:32 +02:00
Laurent Destailleur
3c9ca3860b
Merge pull request #13543 from atm-lena/11.0_FIX_hookmanager_typeAddReplace_completeTabsHead
FIX - Add function "completeTabsHead" to "addreplace" type hook.
2020-04-09 19:37:48 +02:00
Laurent Destailleur
56336e1d30
Merge pull request #13541 from fappels/11_stock_list_default_vis
Fix set default warehouse list columns
2020-04-09 19:35:18 +02:00
Laurent Destailleur
c83f0f7484
Merge pull request #13533 from simicar29/11.0
11.0
2020-04-09 19:34:31 +02:00
Francis Appels
0a8a8bafa0 FIX print pictures in shipment docs 2020-04-09 15:40:36 +02:00
atm-lena
c9ab61b521 FIX - Add function "completeTabsHead" to hooks "addreplace" 2020-04-09 14:54:47 +02:00
Francis Appels
caecb0152f Fix set default warehouse list columns 2020-04-09 14:46:20 +02:00
gauthier
3327f1c074 FIX : IHM, unexpected quote 2020-04-09 11:53:03 +02:00
Laurent Destailleur
b9fc642a35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-08 18:32:23 +02:00
Laurent Destailleur
63f0c07a07 Add warning 2020-04-08 18:32:13 +02:00
stickler-ci
e402e35d96 Fixing style errors. 2020-04-08 14:09:04 +00:00
simicar29
6cb780d125
Avoid the doubledot issue in quoted-printable mail
When sending HTML mail using swiftmailer, the content will be encoded using quoted-printable. We may then encounter the "double dot" issue (doubled dot at the beginning of the line). This can be problematic with broken links to pictures for example.
This PR switches the encoding to base64.
2020-04-08 16:03:41 +02:00
stickler-ci
50b789456d Fixing style errors. 2020-04-08 14:03:16 +00:00
atm-quentin
64f6542f96 FIX buyprice extrafield langfile and tooltip 2020-04-08 15:59:10 +02:00
Laurent Destailleur
3ac07ff84f
Merge pull request #13507 from atm-john/11.0_Fix_warehouse_list
Fix warehouse list
2020-04-08 14:44:55 +02:00
Laurent Destailleur
0716951b6d Fix logo 2020-04-08 13:38:29 +02:00
Laurent Destailleur
9ef6204f7e Fix description of reports (use date of invoice not validation date) 2020-04-08 11:40:38 +02:00
Laurent Destailleur
df81065f73 MAIN_VIEW_LINE_NUMBER_IN_LIST 2020-04-08 11:23:31 +02:00
Regis Houssin
34e434a17e FIX missing member entity 2020-04-06 16:36:11 +02:00
ATM john
88297d5682 fix key 2020-04-06 13:20:42 +02:00
ATM john
721371a08c Fix warehouse list 2020-04-06 13:08:03 +02:00
atm-quentin
9950295e41 FIX author search supplier proposal list 2020-04-06 10:29:04 +02:00
Laurent Destailleur
ed4aa55857 Doxygen 2020-04-05 15:46:10 +02:00
Laurent Destailleur
47987f239d Fix trans 2020-04-05 15:42:39 +02:00
Laurent Destailleur
009cc36355 Fix sendocntext for builk action 2020-04-05 15:39:53 +02:00
Laurent Destailleur
e32ac7644d FIX Send email from bulk action of list of thirdparties 2020-04-05 15:31:18 +02:00
Laurent Destailleur
62387f712c FIX Send email from bulk action of list of thirdparties 2020-04-05 15:26:16 +02:00
Laurent Destailleur
bfbc9b303a Fix phpcs 2020-04-05 12:23:16 +02:00
Laurent Destailleur
e838000795 responsive 2020-04-05 12:11:58 +02:00
Laurent Destailleur
5b8c50cb72 css 2020-04-05 12:07:00 +02:00
Laurent Destailleur
5ca9c71449 css 2020-04-05 12:05:27 +02:00
Laurent Destailleur
98dfc7ca71 Fix css 2020-04-05 12:01:05 +02:00
Laurent Destailleur
13b47774e2 FIX #13424 2020-04-05 11:55:43 +02:00
Laurent Destailleur
50790a7f36 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/filefunc.inc.php
2020-04-05 03:44:06 +02:00
Laurent Destailleur
eac75497c0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-05 03:42:12 +02:00
Laurent Destailleur
d0c4af5855 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-05 03:42:05 +02:00
Laurent Destailleur
8a14652eae
Merge pull request #13449 from atm-quentin/FIX_missing_default_accountancy_product_buy_code
FIX missing default accountancy product buy code
2020-04-05 03:41:46 +02:00
Laurent Destailleur
165df931f1 Complete fix #13491 2020-04-05 03:14:12 +02:00
Laurent Destailleur
22a8c207f4
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
2020-04-05 02:54:41 +02:00
Laurent Destailleur
2f1b25c67a Fix property not defined 2020-04-05 02:43:30 +02:00
Laurent Destailleur
a41f54c82f Fix css 2020-04-05 02:39:40 +02:00
Laurent Destailleur
ed0f6b56b9 FIX: The "test smtp connectivity" failed on page to setup mass emailing 2020-04-05 00:29:34 +02:00
ptibogxiv
c7cdb64087
FIX child categories only with good entity rights
fix v9 to develop
display only categories with good entity rights ( intradolibarr or via REST API)
2020-04-04 11:07:48 +02:00
Laurent Destailleur
d46417c8bd FIX #13482 2020-04-03 17:53:17 +02:00
Laurent Destailleur
372d719693 #13482 2020-04-03 15:48:54 +02:00
Laurent Destailleur
e9bddf5c26 Fix enable/disable of module 2020-04-03 15:36:41 +02:00
Laurent Destailleur
d7e4e5f18c Fix modulebuilder clone message 2020-04-03 15:14:59 +02:00
Laurent Destailleur
a13287e285 Fix: validate of object is ok even if some fields are missing 2020-04-03 14:56:15 +02:00
atm-lena
bc0d98b91c FIX 11.0 Ticket Module - Visibility 4, don't display extrafields at the creation 2020-04-03 14:24:59 +02:00
Laurent Destailleur
f7b6895dc6 Fix option to not generate doc in modulebuilder. 2020-04-03 14:02:37 +02:00
Laurent Destailleur
71910b2181 Fix warning 2020-04-03 13:01:17 +02:00
Laurent Destailleur
193a10bc39 FIX cloning of emailing when no content selected 2020-04-03 02:29:10 +02:00
Laurent Destailleur
4c8a04cf38 Fix phpcs 2020-04-02 21:17:04 +02:00
Laurent Destailleur
644d83d799 Rename field to avoid confusion 2020-04-02 19:42:08 +02:00
Laurent Destailleur
733814a8a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-02 18:51:36 +02:00
Laurent Destailleur
7cee643c05 Prepare 10.0.8 2020-04-02 18:51:25 +02:00
Laurent Destailleur
19084286be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.product.class.php
2020-04-02 16:49:37 +02:00
Laurent Destailleur
7da01c3013 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-02 16:00:20 +02:00
Laurent Destailleur
3408f67348 Clean orhpelins in llx_product_association 2020-04-02 16:00:09 +02:00
Laurent Destailleur
d204cfe6c6 FIX Protection when database has a corrupted product id 2020-04-02 15:54:33 +02:00
Laurent Destailleur
3c75c29e6b
Merge pull request #13463 from atm-quentin/FIX_buyprice_filter_was_only_qty
FIX : Buyprice was updated only if min price for this qty had same qty
2020-04-02 13:08:40 +02:00
Laurent Destailleur
7ad67ff91d
Merge pull request #13462 from atm-florian/11.0
fix advtargetemailing : fatal call to static attribut (table_element is not a static attribut)
2020-04-02 13:05:12 +02:00
Laurent Destailleur
3b6db77cb3
Merge pull request #13460 from atm-quentin/FIX_multicurrency_SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL
FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRIC…
2020-04-02 13:04:00 +02:00
Laurent Destailleur
c6f57c46a8
Update supplier_proposal.class.php 2020-04-02 13:01:49 +02:00
Laurent Destailleur
00a12b9fc8
Merge pull request #13475 from thepocagency/11.0_fix_extrafield_lines_in_template
Copy extrafields of lines from a draft invoice to an invoice template
2020-04-02 12:47:34 +02:00
jribal
7380fa32ec On _checkAccessToResource: category -> categorie 2020-04-02 12:44:50 +02:00
Laurent Destailleur
a7656793da
Merge pull request #13479 from altatof/md
FIX md stylesheet to be included by external modules like eldy
2020-04-02 12:40:10 +02:00
altairis
a743110f03 FIX md stylesheet to be included by external modules like eldy 2020-04-02 10:44:24 +02:00
Florian Mortgat
4d2b4583d0 FIX - This error logs an Orderline::delete error, but this is an Orderline::insert error 2020-04-02 09:28:56 +02:00
stickler-ci
9476fbc3e7 Fixing style errors. 2020-04-01 23:16:13 +00:00
Alex Veremme
7330c31204 Fix ##13474: copy extrafields of LINES from a draft invoice to an
invoice template
2020-04-02 01:10:56 +02:00
Laurent Destailleur
70706d9ea7 FIX Missing token and take into account max date when it can. 2020-04-01 18:48:45 +02:00
Laurent Destailleur
6f0071bebe FIX sort on company on member list 2020-03-31 17:54:48 +02:00
stickler-ci
1f5da36fdb Fixing style errors. 2020-03-31 13:02:44 +00:00
atm-quentin
e3dfe60567 uniformize update buyprice + some fixes 2020-03-31 14:53:15 +02:00
florian HENRY
5658d783d6 fix advtargetemailing : fatal call to static attribut (that is not static: table_element) 2020-03-31 12:04:34 +02:00
atm-quentin
73f6c9210f FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL 2020-03-31 11:03:08 +02:00
Laurent Destailleur
3860f24908 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:56:31 +02:00
Laurent Destailleur
d0c179e1e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:54:32 +02:00
Laurent Destailleur
878c4fb106 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-30 19:53:40 +02:00
Laurent Destailleur
fbce8fcfe3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-03-30 19:46:23 +02:00
Laurent Destailleur
6ecacb9c29 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:38:07 +02:00
Laurent Destailleur
07d64f47e3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:37:29 +02:00
Laurent Destailleur
7466eaade3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:37:01 +02:00
Laurent Destailleur
9fcbec9f02 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:36:07 +02:00
Laurent Destailleur
7c9583011a
Merge pull request #13441 from hgy29/patch-1
FIX: extra date field incorrect check
2020-03-30 19:30:25 +02:00
Laurent Destailleur
1c7ce31207
Merge pull request #13435 from ptibogxiv/patch-316
FIX product get purchase prices
2020-03-30 19:20:32 +02:00
Laurent Destailleur
81b41c932f
Merge pull request #13432 from atm-quentin/FIX_reapro_11
FIX replenish stock to buy
2020-03-30 19:11:34 +02:00
atm-quentin
9a92545d8d FIX missing default accountancy product buy code 2020-03-30 14:28:22 +02:00
atm-quentin
64207ef58d FIX missing array option 2020-03-30 14:18:59 +02:00
Cédric
eead9a93d3
Fix can set desiredstock to (int) 0 from API Rest
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
2020-03-30 13:03:13 +02:00
Francis Appels
3eda785ca5 Add newline end of file 2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab Add token functions to improve modulebuilder compatiblity with maintained versions. 2020-03-30 10:28:20 +02:00
Nicolas Bouquet
31fca2897a
FIX: extra date field incorrect check
Small typo fixed, was preventing extra date fields from being processed, leading to denial of object creation
2020-03-30 10:24:42 +02:00
Laurent Destailleur
9b2da5bdae FIX Missing token 2020-03-29 00:56:11 +01:00
ptibogxiv
cb7342d4c8
FIX product purchase prices
Fix get datas but don't fix cleandata :( @eldy
2020-03-27 20:07:18 +01:00
Laurent Destailleur
4207d94f53 FIX Bad position of total in column
Conflicts:
	htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
f512e0d161 Fix popup 2020-03-27 12:06:58 +01:00
Laurent Destailleur
3a9cc532d7 FIX Use getNomURL instead of hard coded link. Fix limit. 2020-03-27 11:56:59 +01:00
Laurent Destailleur
259f23e96b Look and feel v11 2020-03-27 11:56:45 +01:00
atm-quentin
96481c3d52 FIX ordered stock already in $stock 2020-03-27 09:43:59 +01:00
Laurent Destailleur
9379f6fa9d Fix duplicate tooltip 2020-03-26 20:27:49 +01:00
Laurent Destailleur
4a012c13b2 FIX Translation of tooltips of extrafields 2020-03-26 19:47:28 +01:00
Laurent Destailleur
004397304e FIX Foreign currency lost when splitting a discount 2020-03-26 02:32:53 +01:00
Laurent Destailleur
d3debccabe FIX bad value in currency into discount created from down payment 2020-03-26 02:14:57 +01:00
Laurent Destailleur
88d98acbba FIX #13410
Conflicts:
	htdocs/compta/facture/card.php
2020-03-26 01:26:50 +01:00
Laurent Destailleur
a05f9fad33 FIX Look and feel v11 2020-03-26 01:25:10 +01:00
Laurent Destailleur
ab19bb2455 FIX default value of selectMasssAction broken 2020-03-26 01:25:05 +01:00
Laurent Destailleur
51f8c5ca87 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/expensereport/list.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
Laurent Destailleur
b48c21dbcb If we need more var here, we must fix to have var starting with search_ 2020-03-25 18:47:42 +01:00
Laurent Destailleur
e160ea2bee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-25 18:45:55 +01:00
Laurent Destailleur
33fe7b5f70
Merge pull request #13416 from simnandez/11.0
FIX: Compatibility with multicompany, bad numerotation of task.
2020-03-25 18:40:13 +01:00
Laurent Destailleur
925554d15e More accurate result 2020-03-25 18:27:53 +01:00
VESSILLER
c516a54f78 FIX get remain to pay with rounding decimals 2020-03-25 11:53:47 +01:00
gauthier
81af385259 FIX : when we filter a list on a view status, we want this filter to be on bookmark that we create 2020-03-25 10:27:59 +01:00
Juanjo Menent
fec3377f24 FIX: Compatibility with multicompany, bad numerotation of task. 2020-03-24 18:49:16 +01:00
gauthier
4c0de74470 FIX : sort by default role makes no sense 2020-03-24 16:27:53 +01:00
Laurent Destailleur
1657a6b50a FIX actions on supplier proposal not saved (bad trigger name)
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-03-24 15:00:13 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1e955a89ef FIX #13399 after #13285 and #13183 2020-03-23 15:28:18 +01:00
Laurent Destailleur
0dbc37667c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-23 15:25:42 +01:00
Laurent Destailleur
ca4b641094 FIX #13407 2020-03-23 15:24:29 +01:00
Regis Houssin
45579b0986 FIX remove unused var, $usercancreate can be change by Multicompany 2020-03-23 07:01:23 +01:00
andreubisquerra
fbe6711353
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:46:40 +01:00
Laurent Destailleur
94b6fbb223 FIX #13300 2020-03-22 20:52:00 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Laurent Destailleur
bcf17c79ef FIX closing tags 2020-03-22 02:44:00 +01:00
Laurent Destailleur
4ce1665a15 Fix charset in RSS export 2020-03-21 17:36:07 +01:00
Laurent Destailleur
ade07865d6 FIX Look and feel v11 2020-03-20 21:21:40 +01:00
Laurent Destailleur
3e807b00ba FIX Look and feel v11 2020-03-20 21:21:30 +01:00
Laurent Destailleur
599bf89f60 Fix can edit emailing after sending has started 2020-03-20 20:46:21 +01:00
Laurent Destailleur
5d9e713a1c Fix better default sort order 2020-03-20 20:36:59 +01:00
Laurent Destailleur
d28eaf5824 FIX Backto link 2020-03-20 15:48:50 +01:00
Laurent Destailleur
87e808fec4 Fix phpcs 2020-03-19 22:07:20 +01:00
Laurent Destailleur
a413e2861e Fix edit html 2020-03-19 21:13:15 +01:00
Laurent Destailleur
d9f616d6e3 Avoid file xxx_preview-1.png into export 2020-03-19 15:59:49 +01:00
Laurent Destailleur
c71da5d013 FIX mass action on stock movements 2020-03-19 15:43:06 +01:00
Laurent Destailleur
7eb4522636 FIX missing token and save of survey description 2020-03-19 11:59:57 +01:00
Laurent Destailleur
8e1ffa5144 Fix management of token 2020-03-19 10:52:07 +01:00
Laurent Destailleur
d38c6616e6 Doc 2020-03-19 09:53:20 +01:00
Laurent Destailleur
ea13c707a2
Merge pull request #13380 from atm-john/11.0_fix_import_lines_from_object_for_situation_invoices
FIX import lines from object for situation invoices
2020-03-18 19:25:04 +01:00
Laurent Destailleur
b41ac2a428 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-18 18:37:55 +01:00
Laurent Destailleur
a3328c5ef3 Fix div 2020-03-18 18:37:44 +01:00
Laurent Destailleur
e9e0ce591b
Merge pull request #13379 from atm-lena/11.0_FIX_extrafields_add_tpl_include
FIX : wrong include - replace extrafields_create.tpl.php to extrafiel…
2020-03-18 18:26:57 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0
FIX: Bank movements color is not showing
2020-03-18 18:22:46 +01:00
Laurent Destailleur
a848a8523a
Merge pull request #13377 from atm-john/11.0_fix_situations_invoices_stuff
Fix situations invoices stuff
2020-03-18 18:20:27 +01:00
Laurent Destailleur
cc93a40c45 Fix label of local tax 2020-03-18 14:06:15 +01:00
ATM john
c767e553d3 fix import line from object default value for situations 2020-03-18 10:59:13 +01:00
ATM john
7b8cafb710 remove var_dump 2020-03-18 10:34:44 +01:00
ATM john
d3aeec0a7c Fix situation value transmission 2020-03-18 10:30:15 +01:00
atm-lena
2e1554def4 FIX : wrong include - replace extrafields_create.tpl.php to extrafields_add.tpl.php 2020-03-18 10:18:52 +01:00
Ferran Marcet
1fe4e4415e FIX: Bank movements color is not showing 2020-03-18 09:27:08 +01:00
ATM john
075757eb3d Fix situation value transmission 2020-03-17 16:49:05 +01:00
ATM john
cb43928a5d Fix radio label target 2020-03-17 12:29:14 +01:00
Pierre Ardoin
26f6f04486
forgot ";" 2020-03-17 10:08:18 +01:00
Pierre Ardoin
564f412957
correction due to comments @hregis and @eldy 2020-03-17 10:04:43 +01:00
Laurent Destailleur
37fce0d3ee Fix position on merou
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
8192e9dc67 FIX Missing token in form 2020-03-14 03:02:49 +01:00
Laurent Destailleur
8a9553522f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-14 00:14:52 +01:00
Laurent Destailleur
f774733fcb Sync transifex 2020-03-14 00:14:42 +01:00
Laurent Destailleur
6948e347c4
Merge pull request #13329 from atm-florian/fix_11_multiEntityOnCommCardElement
Fix 11 multi entity on comm card element
2020-03-13 16:57:10 +01:00
Laurent Destailleur
4841a5bf4a Fix look and feel v11 2020-03-13 16:53:37 +01:00
florian HENRY
ca269864f7 let keep it to expedition 2020-03-13 14:55:34 +01:00
Laurent Destailleur
1ff102f62a Prepare 11.0.3 2020-03-13 10:31:28 +01:00
Laurent Destailleur
864c903d05 FIX #13294 2020-03-12 18:55:08 +01:00
Laurent Destailleur
7e428885cc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-12 18:34:43 +01:00
Laurent Destailleur
74b8b9f47d
Merge pull request #13340 from atm-lena/11.0_FIX_loadCacheMsgTicket_PrivateStatus
FIX - Ticket Public  - Private messages are displayed
2020-03-12 17:59:13 +01:00
Laurent Destailleur
6d9967a5d3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-12 17:59:03 +01:00
Laurent Destailleur
dea03efd4f Look and feel v11 2020-03-12 17:58:51 +01:00
Laurent Destailleur
09359b8025
Merge pull request #13338 from altatof/box_shipments
FIX : missing class declaration
2020-03-12 17:06:50 +01:00
Laurent Destailleur
aa3b28a8be
Merge pull request #13337 from simicar29/11.0
Load line extrafields when fetching supplier invoice
2020-03-12 17:06:26 +01:00