lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,429 Commits 43 Branches 150 Tags 886 MiB
10.0.2
Commit Graph

67869 Commits

Author SHA1 Message Date
Laurent Destailleur
f53f314211
Update fournisseur.product.class.php 2019-07-18 17:15:50 +02:00
Florian Mortgat
dbd68027f8 New script that links "orphaned" dispatch lines to order lines 
(the "orphans" are dispatch lines that were created in old versions of Dolibarr which didn’t have fk_commandefourndet in llx_commande_fournisseur_dispatch)
 2019-07-18 17:03:16 +02:00
Florian Mortgat
e404069d26 Revert "FIX: calculation of $products_dispatched" 
This reverts commit 75ae611f9e.
 2019-07-18 17:00:57 +02:00
Florian Mortgat
770b419769 Revert "FIX: wrong display (and hidden input) for already dispatched quantity" 
This reverts commit b155fdc014.
 2019-07-18 17:00:46 +02:00
atm-ph
984fe98342 Fix missing hook 2019-07-18 16:12:42 +02:00
atm-ph
c961a397c4 Fix missing hook then can't interact with actions 2019-07-18 15:40:50 +02:00
Laurent Destailleur
3b393e818a Fix missing entity property into fetch 2019-07-18 14:17:29 +02:00
Laurent Destailleur
e976195777 Fix missing key for api 2019-07-18 14:08:15 +02:00
Laurent Destailleur
5f917c6f7e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-18 13:26:39 +02:00
Laurent Destailleur
29974a5fbf Fix css 2019-07-18 13:26:19 +02:00
Christophe Battarel
5daf0316f9 also fix bad insert sql command 2019-07-18 11:18:25 +02:00
Christophe Battarel
32bc8a5faf FIX fournrprice log for insert 2019-07-18 11:05:51 +02:00
John Botella
b5d348356d Fix socpeople assigned list in action com list 2019-07-17 16:49:41 +02:00
Christophe Battarel
aab23a1531 FIX : do not return formatted prices in json string 2019-07-16 17:50:43 +02:00
Laurent Destailleur
a3b746bcb9
Merge pull request #11517 from hregis/9.0_bug2 
FIX better compatibility with Multicompany
 2019-07-16 17:10:47 +03:00
Laurent Destailleur
77300e1210
Merge pull request #11518 from ATM-Marc/FIX_9.0_propal_clone_hook 
FIX: propal createFrom hook: undefined parameter attached
 2019-07-16 17:04:53 +03:00
gauthier
c72a59ad36 FIX : we need to be able to add freeline with qty between 0 & 1 in supplierorder line 2019-07-16 14:55:19 +02:00
Marc de Lima Lucio
464bda996c FIX: propal createFrom hook: undefined parameter attached 2019-07-16 13:59:00 +02:00
Laurent Destailleur
917799914e
Merge pull request #11433 from atm-florianm/FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set 
FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set
 2019-07-16 13:52:50 +03:00
Regis Houssin
c9fe91138d FIX better compatibility with Multicompany 2019-07-16 12:39:43 +02:00
Laurent Destailleur
617d10bf2a
Merge pull request #11512 from atm-florianm/9.0_FIX_missing-hooks-in-supplier-product-list-and-supplier-product-dispatch 
9.0 fix missing hooks in supplier product list and supplier product dispatch
 2019-07-16 13:27:53 +03:00
John Botella
70ff806fdf fix fourn code preload 2019-07-16 10:46:58 +02:00
Laurent Destailleur
f44182c89f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-16 00:13:52 +02:00
Laurent Destailleur
f826e9631c FIX #11463 2019-07-16 00:12:22 +02:00
Laurent Destailleur
fb5af65f4d FIX #11466 2019-07-15 23:56:05 +02:00
Laurent Destailleur
5d74c81941 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-15 23:48:40 +02:00
Laurent Destailleur
d694360c66 Fix warning 2019-07-15 23:46:54 +02:00
Laurent Destailleur
ea349de081 FIX #11498 2019-07-15 23:25:42 +02:00
Laurent Destailleur
6c23154a91 FIX #11506 2019-07-15 22:59:18 +02:00
Laurent Destailleur
e396824133 FIX #11507 2019-07-15 19:08:57 +02:00
Laurent Destailleur
5778a02ee1 FIX #11505 2019-07-15 18:44:33 +02:00
Laurent Destailleur
b0d46d492f FIX #11509 2019-07-15 18:40:42 +02:00
Florian Mortgat
b155fdc014 FIX: wrong display (and hidden input) for already dispatched quantity 2019-07-15 12:00:06 +02:00
atm-florian.m
75ae611f9e FIX: calculation of $products_dispatched 
After the DB retrieval method was changed from fetch_row to fetch_object, the indices used became wrong.
 2019-07-15 12:00:06 +02:00
atm-florian.m
8aa147a4e5 # missing hooks from dispatch.php and list.php 2019-07-15 11:59:22 +02:00
atm-florian.m
ae540cb25e FIX: add missing hook calls 2019-07-15 11:59:22 +02:00
Regis Houssin
294bc5dcb5 FIX avoid conflict with "$classname" in card.php 2019-07-15 10:19:06 +02:00
Laurent Destailleur
e1d4917704 FIX Missing field "Conciliated" into bank transaction export 2019-07-14 00:39:42 +02:00
Laurent Destailleur
251d501c8e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-14 00:32:46 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85 Fix save of doc template for recuring invoices. 2019-07-14 00:10:15 +02:00
Laurent Destailleur
8090a8abb6 Fix param [] -> null 2019-07-14 00:07:27 +02:00
Laurent Destailleur
39e77dbdc6
Merge pull request #11461 from ATM-Nicolas/fix_template_invoice_edit_modelpdf 
FIX : We must save code instead of value in database…
 2019-07-14 00:19:13 +03:00
Laurent Destailleur
5ccb397af9
Merge pull request #11473 from hregis/9.0_security 
FIX better compatibility with multicompany transverse mode
 2019-07-13 23:42:36 +03:00
Laurent Destailleur
f285bed2ff
Merge pull request #11479 from atm-gauthier/8.0_fix_report_by_tva 
FIX : accounting mode must be taken from global conf, because there's…
 2019-07-13 23:40:15 +03:00
Laurent Destailleur
b6571d9fc3
Update byratecountry.php 2019-07-13 22:39:25 +02:00
Laurent Destailleur
edd51bb150
Merge pull request #11469 from atm-maxime/fix_prelevement_rum 
Fix : use RUM if defined in bank account
 2019-07-13 23:34:31 +03:00
Laurent Destailleur
f34d96b5fb
Merge pull request #11475 from atm-lena/9.0_fix_help_text 
FIX help text
 2019-07-13 23:32:35 +03:00
Laurent Destailleur
4dabdfa5ac
Merge pull request #11483 from inoveaconseil/FIX_update_price 
FIX element name in update_price
 2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e
Update commonobject.class.php 2019-07-13 22:29:50 +02:00
Regis Houssin
4dab57b494 FIX phpcs 2019-07-13 11:24:25 +02:00
Regis Houssin
b7df4a2cd0 FIX this function can not be private 2019-07-13 11:21:07 +02:00
Regis Houssin
332abd2a9f FIX __INFOS__ tag not exists 2019-07-13 11:02:45 +02:00
Laurent Destailleur
b1e21ed5fc FIX Computed field were not calculated into lists. 2019-07-11 22:18:44 +02:00
Laurent Destailleur
694be619b2 Fix doxygen 2019-07-11 22:16:32 +02:00
atm-florian.m
4f03165806 FIX: outdated phpdoc 2019-07-11 12:28:24 +02:00
Nicolas ZABOURI
abd0abf115 FIX element name in update_price 2019-07-10 18:36:12 +02:00
gauthier
cce8f98afc FIX : accounting mode must be taken from global conf, because there's no way to choose a mode with interface 2019-07-10 16:33:03 +02:00
atm-lena
a3f5397988 FIX help text 2 2019-07-10 15:55:50 +02:00
atm-lena
cebf81a514 FIX helpp text 2019-07-10 15:18:25 +02:00
Regis Houssin
41b004c2b8 FIX better compatibility with multicompany transverse mode 2019-07-10 12:16:32 +02:00
Maxime Kohlhaas
0aa42fefae Fix : use RUM if defined in bank account 2019-07-09 18:13:11 +02:00
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved 
FIX Permission for BOM menu
 2019-07-09 00:14:01 +02:00
Laurent Destailleur
69db6e6aa7 Fix look and feel v10 2019-07-05 18:45:13 +02:00
Laurent Destailleur
93d9f73f1d Trans 2019-07-05 17:44:31 +02:00
Laurent Destailleur
42576eb27a Fix status of email templates not visible for non admin users 2019-07-05 17:22:13 +02:00
Laurent Destailleur
9b32763919 Fix label for report n ledger for transitionnal bank account on tranfer 2019-07-05 15:25:29 +02:00
Laurent Destailleur
675b7b2e32 Fix link to reconcile 2019-07-05 13:11:30 +02:00
Laurent Destailleur
575dce2dff Fix css 2019-07-05 12:17:36 +02:00
Laurent Destailleur
5c6684bb73 Fix setup of ticket module 2019-07-05 11:53:33 +02:00
Laurent Destailleur
33bff1353c Fix css 2019-07-05 11:45:10 +02:00
Laurent Destailleur
e3359c6f0f FIX Can't submit a ticket from public interface 2019-07-05 11:21:04 +02:00
ATM-Nicolas
3d076d8bf9 FIX : We must save code instead of value in database for template invoice modelpdf 2019-07-05 11:16:12 +02:00
Laurent Destailleur
c3715646e7 Missing trans 2019-07-04 21:29:27 +02:00
Laurent Destailleur
4c03aa6547 Fix selection of profile for demo 2019-07-04 17:03:36 +02:00
Laurent Destailleur
ed39849d33 Fix css 2019-07-04 16:14:10 +02:00
Laurent Destailleur
fb8c93a69d FIX Bad sql request 2019-07-04 16:00:14 +02:00
atm-florian.m
8030735ded Merge branch 'FIX_add_checkbox_on_shipment_delete_confirm_dialog_to_ask_if_stock_should_be_incremented' into FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set 
(taking PR comments into account)
 2019-07-04 15:35:22 +02:00
atm-florian.m
64d1ebf59c FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion. 2019-07-04 15:06:39 +02:00
Regis Houssin
bfa7f22209 FIX missing "dropdown-icon" replacement 2019-07-04 14:55:41 +02:00
Laurent Destailleur
512b832c77 CSS 2019-07-04 13:26:20 +02:00
Laurent Destailleur
657a3ae4c5 FIX permission to delete a draft purchase order 2019-07-04 12:43:32 +02:00
Laurent Destailleur
69e0353e12 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-04 12:26:26 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
Laurent Destailleur
8b0b824471 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-04 12:22:48 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/action/card.php
 2019-07-04 12:22:40 +02:00
Laurent Destailleur
f8de11492e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:25 +02:00
Laurent Destailleur
bc309ace38 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:16 +02:00
Laurent Destailleur
d04b19549e
Merge pull request #11453 from atm-greg/FIX_9.0_selectForFormsList_for_invoices 
fix case objecttmp is an invoice in selectForFormsList
 2019-07-04 12:20:56 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php 2019-07-04 12:20:34 +02:00
Laurent Destailleur
a9dfca70cf
Merge pull request #11452 from atm-florianm/FIX_minor_spelling_issues 
FIX: minor spelling issues
 2019-07-04 12:19:26 +02:00
Laurent Destailleur
1926d430d8
Merge pull request #11448 from ptibogxiv/patch-196 
Fix paymentmethod detach
 2019-07-04 12:12:18 +02:00
Laurent Destailleur
125c2a65c0
Merge pull request #11445 from atm-john/9.0_fix_dictionary 
Fix missing hidden input and short label
 2019-07-04 10:54:16 +02:00
Laurent Destailleur
108c7aa9ca
Merge pull request #11444 from aspangaro/10.0p1 
FIX SQL problem on donation & nowrap on amount
 2019-07-04 10:39:41 +02:00
Laurent Destailleur
10e3e37c6c
Update don.class.php 2019-07-04 10:39:30 +02:00
Laurent Destailleur
75aa11e526 Code comment 2019-07-04 02:02:44 +02:00
atm-greg
2f5b9ccb22 fix case objecttmp is an invoice 2019-07-03 17:00:18 +02:00
atm-florian.m
3e53a06b2e minor spelling issues 2019-07-03 16:17:47 +02:00
Ferran Marcet
433835860c FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized 2019-07-03 13:12:41 +02:00
Laurent Destailleur
ff68b110b2 Fix phpcs 2019-07-02 23:14:22 +02:00
ptibogxiv
03938e2123
Update paymentmodes.php 2019-07-02 21:56:50 +02:00
ptibogxiv
126479b5a9
Fix paymentmethod detach 2019-07-02 21:46:00 +02:00
Laurent Destailleur
9d50c67208 FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export 2019-07-02 18:06:51 +02:00
Laurent Destailleur
d9560dbb61 Fix var not initialized 2019-07-02 18:02:06 +02:00
John Botella
a75a2ae8e4 Fix missing hidden input and short label 2019-07-02 15:44:42 +02:00
Laurent Destailleur
3b0f1c733f Fix missing token 2019-07-02 15:00:17 +02:00
Laurent Destailleur
8a25c854e9 Hide sensitive data 2019-07-02 14:38:26 +02:00
Alexandre SPANGARO
ab7cb7bb2e FIX Nowrap on amount 2019-07-02 12:01:50 +02:00
Laurent Destailleur
1b4507f07d Fix on a hidden option 2019-07-02 11:40:05 +02:00
Maxime Kohlhaas
6b43c325c7 Fix wrong column for filters on invoice template list 2019-07-02 10:53:47 +02:00
atm-quentin
8cdb251ca5 FIX product_use_units was set to 0 each time a conf in block other was set 2019-07-02 10:18:03 +02:00
Laurent Destailleur
edd4d0751b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:28:44 +02:00
Laurent Destailleur
ef27e32f53 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:27:57 +02:00
Laurent Destailleur
3abaecfd77 Prepare 8.0.7 2019-07-01 13:27:18 +02:00
atm-florian.m
c45b191330 FIX: when STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set, deleting a "closed" shipment now increases stock as expected 2019-07-01 10:26:03 +02:00
atm-josselin
c24a95b7ad Sanitize at creation of the product instead of the creation of the filepath 2019-07-01 09:31:01 +02:00
Laurent Destailleur
511b21ca9c Fix for doliwamp 2019-07-01 00:22:28 +02:00
Laurent Destailleur
46ced373be Fix for doliwamp 2019-06-30 23:52:28 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
Laurent Destailleur
2cefe638ef Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/compta/prelevement/factures.php
 2019-06-29 23:24:04 +02:00
Laurent Destailleur
fb42333b3e Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-06-29 23:20:07 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
e9c6a10bdd Fix phpcs 2019-06-29 18:35:36 +02:00
Laurent Destailleur
72084f4684 Fix protected 2019-06-29 16:49:32 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
8aebcc45b2 Fix message to not show sometimes 2019-06-29 01:54:38 +02:00
Laurent Destailleur
97827f5172 Fix print 2019-06-29 01:44:49 +02:00
Laurent Destailleur
854bbf8405 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-28 14:09:00 +02:00
Laurent Destailleur
a33071d779 FIX #11421 2019-06-28 12:52:35 +02:00
Laurent Destailleur
a8837f5645
Merge pull request #11413 from atm-quentin/FIX_ending_slash 
FIX ending slash
 2019-06-27 20:23:22 +02:00
Laurent Destailleur
63284e0f24 Trans 2019-06-27 19:42:22 +02:00
Laurent Destailleur
c7db76f05a Trans 2019-06-27 19:38:53 +02:00
Laurent Destailleur
ab1f0aba93 Fix trans 2019-06-27 19:28:40 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +02:00
Laurent Destailleur
8c6485fa20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	ChangeLog
	htdocs/compta/facture/card.php
 2019-06-27 13:56:33 +02:00
Laurent Destailleur
7f9b407c37 Sync transifex 2019-06-27 13:52:46 +02:00
Laurent Destailleur
84e4def180 Transifex sync 2019-06-27 13:39:54 +02:00
Laurent Destailleur
d69b20311b FIX If the replacement invoice has been deleted we can reopen 2019-06-27 01:13:46 +02:00
Laurent Destailleur
be695a8e1a Fix link for situations 2019-06-27 00:51:03 +02:00
Laurent Destailleur
244d21bd2b Fix trans 2019-06-27 00:45:17 +02:00
atm-quentin
49db277368 FIX ending slash 2019-06-26 16:42:14 +02:00
Laurent Destailleur
7c73004171 Fix trans 2019-06-26 13:14:16 +02:00
Laurent Destailleur
a68d9fc5e6 Fix css 2019-06-25 23:31:29 +02:00
Laurent Destailleur
f2ea78f2ec Removed useless files 2019-06-25 23:26:55 +02:00
Laurent Destailleur
9b9070dbf8 Removed useless files 2019-06-25 23:26:34 +02:00
Laurent Destailleur
7a0962a393 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAccounting.class.php
 2019-06-25 23:13:55 +02:00
Laurent Destailleur
83f5b23ade Doc 2019-06-25 22:39:04 +02:00
Laurent Destailleur
d5479cd9ae Fix import of ledger 2019-06-25 22:37:13 +02:00
Laurent Destailleur
20471c54e1 Fix import code (regex of data imported + import of constant) 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2019-06-25 22:27:00 +02:00
Laurent Destailleur
fc574946b1 Fix import of ledger 2019-06-25 22:23:51 +02:00
Laurent Destailleur
0ae0951d7d Fix import code (regex of data imported + import of constant) 2019-06-25 22:23:30 +02:00
Laurent Destailleur
85919d8324 Code comment 2019-06-25 22:02:19 +02:00
Laurent Destailleur
70967b4ea1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd Fix purge of old files 2019-06-25 20:02:14 +02:00
Laurent Destailleur
4696d35bcb Fix we need to keep temp dir 2019-06-25 19:02:24 +02:00
Laurent Destailleur
a2d50eb95a Fix sql regression 2019-06-25 18:12:12 +02:00
Laurent Destailleur
a776f3671b Fix demo profiles 2019-06-25 16:50:42 +02:00
Laurent Destailleur
27ad0d1f88 Trans 2019-06-25 16:35:25 +02:00
Laurent Destailleur
a98ceb584d Fix syntax error 2019-06-25 16:08:01 +02:00
Laurent Destailleur
171a173935 Fix phpcs 2019-06-25 14:30:48 +02:00
atm-quentin
7f62fdbfe4 FIX buyprice barcode default val 2019-06-25 14:27:44 +02:00
Laurent Destailleur
f984a77044 FIX Fallback on main language for alternative languages 2019-06-25 14:05:10 +02:00
Laurent Destailleur
700acbeefb Fix phpcs 2019-06-25 13:26:02 +02:00
Laurent Destailleur
2f7e9aa363 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
 2019-06-25 13:24:45 +02:00
Laurent Destailleur
c9883eecd2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/fichinter/list.php
 2019-06-25 13:23:19 +02:00
Laurent Destailleur
144f2a5159 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fichinter/list.php
 2019-06-25 13:15:57 +02:00
Laurent Destailleur
736f918bac Fix phpcs 2019-06-25 13:14:11 +02:00
Laurent Destailleur
de3ec5682c
Merge pull request #11403 from fmarcet/7.0 
FIX: Not showing Contract and Project columns on ficheinter list
 2019-06-25 13:07:03 +02:00
Laurent Destailleur
def94b55c0 CSS 2019-06-25 13:02:11 +02:00
Laurent Destailleur
1c924ef17e Fix bad label on supplier invoice 2019-06-25 12:54:02 +02:00
Laurent Destailleur
560f145a32 Fix css 2019-06-25 11:35:40 +02:00
Laurent Destailleur
b6ad78fdd9 Fix sort 2019-06-25 11:25:36 +02:00
Laurent Destailleur
b8b0ad0d27 Fix migration 2019-06-25 11:22:35 +02:00
Laurent Destailleur
5031b6c06b Fix bad id 2019-06-25 11:18:31 +02:00
Laurent Destailleur
5f17cfe462 Fix bad id 2019-06-25 11:09:13 +02:00
Laurent Destailleur
27be93f535 Fix bad id 2019-06-25 11:08:42 +02:00
Laurent Destailleur
4ed2db6d21 Fix bad id 2019-06-25 11:08:14 +02:00
Laurent Destailleur
e6b643e073 Fix syntax error 2019-06-25 11:07:14 +02:00
Laurent Destailleur
36f1527f76 Fix backward compatibility for type of members 2019-06-25 11:06:10 +02:00
Laurent Destailleur
ca3988ca73 Fix backward compatibility for type of members 2019-06-25 10:58:44 +02:00
Laurent Destailleur
732fd8a04b Fix look and feel v10 2019-06-25 10:28:58 +02:00
Laurent Destailleur
74f61b3b9a Fix status not loaded 2019-06-25 10:23:30 +02:00
Ferran Marcet
7f127989b2 FIX: Not showing Contract and Project columns on ficheinter list 2019-06-25 09:55:34 +02:00
Laurent Destailleur
d85ec982e5 Fix do not output log in arhived log for draft documents 2019-06-24 23:39:44 +02:00
Laurent Destailleur
51506724ef FIX Do no record log in archived log for draft documents. 2019-06-24 23:36:52 +02:00
Laurent Destailleur
31ffa6bc69 FIX #11218 #11150 2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100 FIX #11218 #11150 2019-06-24 18:40:31 +02:00
Laurent Destailleur
35c3eb0d7e Fix conflict in a translation key 2019-06-24 17:59:00 +02:00
Laurent Destailleur
ae1ad80994 Fix count 2019-06-24 16:32:42 +02:00
Laurent Destailleur
70f19b3a3d Fix counter of record 2019-06-24 16:31:56 +02:00
Laurent Destailleur
293b3987e8 CSS 2019-06-24 16:28:54 +02:00
Laurent Destailleur
28024d5cd1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:28:48 +02:00
Laurent Destailleur
b98874848f Fix backport 9.0 2019-06-24 16:12:54 +02:00
Laurent Destailleur
84575df7e6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 16:12:20 +02:00
atm-josselin
7a17c43b26 FIX : filepath of generated documents doesn't handle products with special characters 2019-06-24 16:05:24 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail 
FIX mass send mail
 2019-06-24 15:34:06 +02:00
Laurent Destailleur
7bbbe49b70
Merge pull request #11389 from atm-john/9.0_fix_ancor 
Fix send mail ancor
 2019-06-24 15:29:36 +02:00
Laurent Destailleur
7e10208619
Merge pull request #11380 from atm-florian/9.0 
fix depending extrafeilds list
 2019-06-24 15:23:48 +02:00
Laurent Destailleur
43fc0466e5 Fix position of modules 2019-06-23 20:05:15 +02:00
Laurent Destailleur
a6fc75fed2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
 2019-06-23 18:12:30 +02:00
Laurent Destailleur
0854984a08 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-06-23 18:09:49 +02:00
Laurent Destailleur
b153019000 FIX security (a user can read leave or holiday of other without perm. 2019-06-23 18:08:24 +02:00
Laurent Destailleur
1c48b8be32 Fix code comment 2019-06-23 17:23:41 +02:00
Laurent Destailleur
8866ab5565 Fix missing trans 2019-06-23 16:42:06 +02:00
Laurent Destailleur
8a9c858609 Code comment 2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
71b266b5a8 Code comment 2019-06-22 19:20:01 +02:00
Laurent Destailleur
2854e0dae6 Code comment 2019-06-22 19:15:15 +02:00
Laurent Destailleur
d9f6d9f0c3 Code comment 2019-06-22 19:12:44 +02:00
Laurent Destailleur
e456cd27d1 Fix deprecated call and hide pass in debug 2019-06-22 18:42:24 +02:00
Laurent Destailleur
662afe8a36 Fix missing global 2019-06-22 18:24:29 +02:00
Laurent Destailleur
db241b22dd Fix clean of database 2019-06-22 14:33:31 +02:00
Laurent Destailleur
e6ea9cc448 Clean widget not correctly removed 2019-06-22 14:15:10 +02:00
Laurent Destailleur
64de57d781 FIX bad request 2019-06-22 13:28:20 +02:00
Laurent Destailleur
ee8ddb5744 Fix link to fix table charset 2019-06-22 13:23:00 +02:00
Laurent Destailleur
0f808114e5 Sync transifex 
Fix CSS for Left To Right Languages
 2019-06-22 13:18:33 +02:00
Laurent Destailleur
ed34d4ccbd Bad trans 2019-06-22 12:10:30 +02:00
Laurent Destailleur
9e7b08e378 Trans missing 2019-06-22 12:05:17 +02:00
Laurent Destailleur
a4cd7772ef Fix title 2019-06-22 12:02:41 +02:00
Laurent Destailleur
18348fea93 Fix sort on date on agenda list 2019-06-22 11:34:16 +02:00
Laurent Destailleur
a7d7d44f87 FIX Management of vat info in stripe 2019-06-21 19:59:16 +02:00
Laurent Destailleur
0bc0f8ae94 Fix translation of country 2019-06-21 15:40:35 +02:00
John Botella
ec7ebe9f39 redo backported fix and update adherent substitution methode 2019-06-21 15:32:38 +02:00
John Botella
200b66d11f Remove a backported fix because failling at init test 2019-06-21 14:52:12 +02:00
Laurent Destailleur
c63b465d48 Fix doxygen 2019-06-21 14:34:04 +02:00
Laurent Destailleur
4499447a89 Fix sort order of import profiles 
Fix picto in import profile for accounting
 2019-06-21 14:27:38 +02:00
Laurent Destailleur
f9095408b6 Fix sort order of export profiles 
Add missing pos information into export of invoice
Add missing label of project in export of invoice
 2019-06-21 13:25:40 +02:00
Laurent Destailleur
ad4bd05efb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:29:06 +02:00
Laurent Destailleur
c725db166d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-21 11:26:44 +02:00
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
John Botella
e5298d0666 Fix send mail ancor 2019-06-21 11:20:04 +02:00
Laurent Destailleur
e28bf71964 Fix error management of warehouse->delete 2019-06-20 18:15:14 +02:00
Laurent Destailleur
d47cf87c00 Look and feel v10 2019-06-20 17:59:28 +02:00
Laurent Destailleur
6b5d477476 Fix search criteria lost after a delete 2019-06-20 17:14:04 +02:00
Laurent Destailleur
c521b9b8f8 Fix dispatch in ledger table of withdraw / direct debit payment 2019-06-20 16:58:51 +02:00
Laurent Destailleur
faadae8157 Code comment 2019-06-20 15:59:45 +02:00
Laurent Destailleur
ff0f6295d8 Fix phpcs 2019-06-20 13:59:53 +02:00
Laurent Destailleur
29e3199639 Fix phpcs 2019-06-20 13:39:29 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10 
Fix link to direct debit payment order
 2019-06-20 13:37:06 +02:00
Laurent Destailleur
bff6260983 Fix syntax error 2019-06-20 12:34:29 +02:00
Laurent Destailleur
cb057e9c6d NEW Add hidden option to be ready for BREXIT 2019-06-20 12:32:14 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
florian HENRY
0865bdb60f fix depending extrafeilds list 2019-06-20 12:16:48 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +02:00
Laurent Destailleur
ee8e7d66f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 03:43:27 +02:00
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-06-20 03:43:16 +02:00
Laurent Destailleur
26c12c61a7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-20 03:39:56 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other 
Translate rights
 2019-06-20 03:36:16 +02:00
Laurent Destailleur
980239e617
Merge pull request #11362 from aspangaro/10.0_index 
Responsive on project index
 2019-06-20 03:35:13 +02:00
Laurent Destailleur
03178bc481
Merge pull request #11293 from hregis/develop_pdf 
FIX better method to check if pdf is protected/encrypted
 2019-06-20 03:22:51 +02:00
Laurent Destailleur
53688e2d0f
Merge pull request #11353 from fmarcet/8.0 
FIX: Wrong stock movement on supplier credit notes
 2019-06-20 03:11:28 +02:00
Laurent Destailleur
ca4b8f9540
Merge pull request #11355 from ptibogxiv/patch-190 
Fix access category API
 2019-06-20 03:10:11 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber 
Allow zero as account number
 2019-06-20 03:09:37 +02:00
Laurent Destailleur
d840c8f831
Merge pull request #11348 from frederic34/patch-5 
Update companies.lang
 2019-06-20 03:05:43 +02:00
Laurent Destailleur
23b0263ad9
Merge pull request #11357 from frederic34/patch-8 
avoid countable error
 2019-06-20 03:05:23 +02:00
Laurent Destailleur
daab58974e
Merge pull request #11366 from aspangaro/10.0_other2 
Missing language key
 2019-06-20 03:02:13 +02:00
Laurent Destailleur
b4cb440b0f
Merge pull request #11359 from inoveaconseil/FIX_BOM_sql 
Fix bom sql
 2019-06-20 02:58:24 +02:00
Laurent Destailleur
4c7a689fb5
Merge pull request #11373 from atm-john/8.0_fix_var_name 
FIX var name
 2019-06-20 02:57:39 +02:00
Laurent Destailleur
a70dfa17a4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 02:56:53 +02:00
Laurent Destailleur
6d38f5ec9c FIX #11369 2019-06-20 02:56:44 +02:00
Laurent Destailleur
925314c710
Merge pull request #11367 from aspangaro/10.0_other3 
Nowrap on amount
 2019-06-20 02:51:14 +02:00
Laurent Destailleur
e060af5c97
Update treso.php 2019-06-20 02:50:23 +02:00
Laurent Destailleur
bf71731fc9 Fix phpcs 2019-06-19 22:28:33 +02:00
Laurent Destailleur
d6b6f77e74 Fix support domains with 3 levels 2019-06-19 22:06:12 +02:00
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
Laurent Destailleur
7c4cddf28d Fix missing trad 2019-06-19 16:34:01 +02:00
Laurent Destailleur
5b5028254f Fix label 2019-06-19 16:30:03 +02:00
Laurent Destailleur
c3b8582076 Fix use of deprecated function 2019-06-19 15:55:18 +02:00
Laurent Destailleur
daa8b43732 css 2019-06-19 15:51:48 +02:00
Laurent Destailleur
04f2fb604f Fix duplicate 'option_' in prefix 2019-06-19 15:48:37 +02:00
Laurent Destailleur
a11c816a17 Fix tooltip 2019-06-19 14:24:48 +02:00
Laurent Destailleur
f9cc120d75 Debug module ticket 2019-06-19 12:53:28 +02:00
Laurent Destailleur
7afcdb46eb Debug module ticket 2019-06-19 12:10:05 +02:00
gauthier
3ad13adf31 FIX : better syntax 2019-06-19 10:43:42 +02:00
gauthier
7331e43db8 FIX : we need to fetch fourn invoice with ref in current entity 2019-06-19 10:19:33 +02:00
Alexandre SPANGARO
9bde7c5229 Nowrap on amount 2019-06-19 09:21:18 +02:00
Alexandre SPANGARO
e44b9113b7 Nowrap on amount 2019-06-19 09:01:57 +02:00
Alexandre SPANGARO
ec7523d3d2 Nowrap on amount 2019-06-19 09:01:37 +02:00
Alexandre SPANGARO
b8311da262 Nowrap on amount 2019-06-19 08:56:45 +02:00
Alexandre SPANGARO
9a32117b1d Nowrap on amount 2019-06-19 08:43:57 +02:00
Alexandre SPANGARO
a849fbe42e Nowrap on amount 2019-06-19 07:15:52 +02:00
Alexandre SPANGARO
ffbb14f40e Missing language key 2019-06-19 06:28:22 +02:00
Alexandre SPANGARO
13836d3e21 Missing language ley 2019-06-19 06:21:53 +02:00
Alexandre SPANGARO
f91c40a45c Translate rights 2019-06-19 06:00:11 +02:00
Alexandre SPANGARO
9234a54468 Translate rights 2019-06-19 05:49:23 +02:00
Alexandre SPANGARO
e1c476e744 Translate rights 2019-06-19 05:48:04 +02:00
Alexandre SPANGARO
42b03ec858 Translate rights 2019-06-18 22:53:50 +02:00
Alexandre SPANGARO
a0ae1e96a3 Translate rights 2019-06-18 22:52:37 +02:00
Alexandre SPANGARO
4de0a57f5c Translate rights 2019-06-18 22:44:43 +02:00
Alexandre SPANGARO
ce37544088 Translate rights 2019-06-18 22:41:18 +02:00
Alexandre SPANGARO
c59de49894 Translate rights 2019-06-18 22:38:52 +02:00
Alexandre SPANGARO
30fb89ad5e Responsive HRM index 2019-06-18 22:03:29 +02:00
Alexandre SPANGARO
bcd5949bac Responsive on project index 2019-06-18 21:39:30 +02:00
Laurent Destailleur
53923a8581 Fix scrutinizer warnings 2019-06-18 20:21:22 +02:00
Laurent Destailleur
663998bab1 Fix scrutinizer errors 2019-06-18 20:15:04 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Laurent Destailleur
20e00ca290 FIX if last char of customercode is accent making the truncate of first 
chars wrong.
 2019-06-18 19:41:16 +02:00
Laurent Destailleur
f3703c8805 Fix phpcs 2019-06-18 18:07:47 +02:00
Laurent Destailleur
2e1eb29ca0 Fix rendering of amount 2019-06-18 17:43:08 +02:00
Laurent Destailleur
13abfc3140 Code comment 2019-06-18 16:46:12 +02:00
Laurent Destailleur
1dc247705d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/holiday/list.php
 2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-18 16:04:48 +02:00
Laurent Destailleur
81bca34a08 FIX A user may read holiday and expense report without permissions 2019-06-18 16:04:25 +02:00
Laurent Destailleur
6e9874b95a FIX A user may read holiday and expense report without permissions 2019-06-18 16:01:24 +02:00
Laurent Destailleur
6afda6a47a FIX invalid link on user.fk_user 2019-06-18 15:57:22 +02:00
Laurent Destailleur
6bda130835 Protect from dir scan 2019-06-18 14:51:57 +02:00
Laurent Destailleur
27f52dd0bd Fix columns in csv 2019-06-18 14:32:35 +02:00
Laurent Destailleur
ad20a5158c Fix columns in csv 2019-06-18 14:32:28 +02:00
Laurent Destailleur
8835b49f3f Debug the accounting-file tool 2019-06-18 14:30:13 +02:00
Nicolas ZABOURI
96c6994827 FIX 2 déclarations of date_valid in SQL 2019-06-18 10:55:16 +02:00
Frédéric FRANCE
f1d64ad164
Update peruser.php 2019-06-17 23:02:54 +02:00
ptibogxiv
e4f5ca79f8
Fix access category API 2019-06-17 19:36:21 +02:00
Laurent Destailleur
0123a18ff8 Look and feel v10 2019-06-17 18:44:08 +02:00
Laurent Destailleur
42e58d9ea5 Fix preview of interventions 2019-06-17 18:38:14 +02:00
Eric Seigne
0b3bc5a172 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber 2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
a6d4475aff Fix scrutinizer 2019-06-17 18:24:45 +02:00
Laurent Destailleur
bde49e05e7 Fix doc 2019-06-17 18:23:38 +02:00
Laurent Destailleur
f6f8692711 Fix phpcs 2019-06-17 18:12:28 +02:00
Laurent Destailleur
f6f66f2a77 Fix syntax error 2019-06-17 18:11:38 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287 Debug page to export file 2019-06-17 17:20:22 +02:00
Ferran Marcet
c62f370959 FIX: Wrong stock movement on supplier credit notes 2019-06-17 16:30:56 +02:00
Laurent Destailleur
dac99c878c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/projet/tasks/time.php
 2019-06-17 15:57:06 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Laurent Destailleur
cf82587504 Fix menu entry 2019-06-17 15:02:44 +02:00
Frédéric FRANCE
a399e3f63d
Update companies.lang 2019-06-17 13:33:44 +02:00
Laurent Destailleur
8330078de1 Fix default value 2019-06-17 12:33:09 +02:00
Regis Houssin
3afd4e15ad FIX try to remove ob_* functions 2019-06-17 07:09:19 +02:00
Regis Houssin
908b5fff00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf 2019-06-17 07:08:35 +02:00
Laurent Destailleur
157526205d Fix css 2019-06-16 23:00:40 +02:00
Laurent Destailleur
c0a30d1ff5 FIX #11325 FIX #5249 
Conflicts:
	htdocs/projet/tasks/time.php
 2019-06-16 22:21:38 +02:00
Laurent Destailleur
dd5e42e325 FIX #11325 FIX #5249 2019-06-16 22:17:04 +02:00
Laurent Destailleur
f833dc1176
Merge pull request #11341 from frederic34/patch-5 
missing translation in agenda.lang
 2019-06-16 17:27:26 +02:00
Laurent Destailleur
4f03d4f642
Merge branch '10.0' into patch-189 2019-06-16 17:26:41 +02:00
Laurent Destailleur
badfd47ee7 Fix migration 2019-06-16 17:25:42 +02:00
Laurent Destailleur
efb9a30ec1 Fix compatibility with payment modes 2019-06-16 17:17:07 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
ptibogxiv
651f4158ac
Fix add / delete contact access 2019-06-16 14:18:26 +02:00
Juanjo Menent
a73ae49c4d FIX: #11296 2019-06-14 18:56:30 +02:00
ptibogxiv
d838ced12e
Update 9.0.0-10.0.0.sql 2019-06-14 18:41:38 +02:00
ptibogxiv
cd5c2c3249
Update llx_bom_bom.sql 2019-06-14 18:39:05 +02:00
Juanjo Menent
8afffc8762 FIX: #11335 2019-06-14 18:28:01 +02:00
Frédéric FRANCE
baf95c3c86
Update agenda.lang 2019-06-14 16:47:53 +02:00
Laurent Destailleur
bc8c7e0d4f Code comment 2019-06-14 15:03:37 +02:00
Laurent Destailleur
3585a5161c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-14 13:58:28 +02:00
Laurent Destailleur
a7ca177100 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-14 13:58:19 +02:00
Laurent Destailleur
239e41f6c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-14 13:57:49 +02:00
Laurent Destailleur
122c4eb8bd
Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction 
FIX empty test
 2019-06-14 13:51:34 +02:00
Laurent Destailleur
5cada6ee0b
Merge pull request #11336 from ptibogxiv/patch-186 
Fix measuring_units_string display function
 2019-06-14 13:48:31 +02:00
Laurent Destailleur
1fa1b91916
Update product.lib.php 2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db
Update product.lib.php 2019-06-14 13:38:52 +02:00
Laurent Destailleur
e6b6246fea
Merge pull request #11334 from atm-florianm/8.0_FIX-print-dictionaries-escape 
FIX: in edit mode, dictionary inputs do not escape the string inside …
 2019-06-14 13:36:06 +02:00
Laurent Destailleur
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
ATM john
e7d81a68f0 Fix Override Attribute 2019-06-13 22:11:47 +02:00
Laurent Destailleur
ff1adb3934 Fix dead code 2019-06-13 22:11:25 +02:00
ATM john
0ef9a8843a Fix empty test 2019-06-13 21:57:30 +02:00
ptibogxiv
a30f029bbf
Update product.lib.php 2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58
Fix measuring_units_string display function 2019-06-13 20:52:52 +02:00
atm-florian.m
787e1319b9 FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes 2019-06-13 16:21:07 +02:00
Laurent Destailleur
53be6492b8 Finish module BOM 2019-06-13 14:20:13 +02:00
Laurent Destailleur
7e1eacb7d5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-13 13:26:54 +02:00
Laurent Destailleur
357c5244f7 Fix phpcs 2019-06-13 13:26:35 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-06-13 12:15:51 +02:00
Laurent Destailleur
52159dcb69 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:14:19 +02:00
Laurent Destailleur
3e6b7208cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a Fix syntax error 2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:07:24 +02:00
Laurent Destailleur
b90550f15a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-13 11:07:52 +02:00
Laurent Destailleur
4b26702516 code comment 2019-06-13 11:07:38 +02:00
Laurent Destailleur
60e1e89981
Merge pull request #11328 from fappels/clean_10_beta 
Fix scrutinizer bugs
 2019-06-13 10:18:59 +02:00
Laurent Destailleur
ab9742f4df
Try to keep proportion of logo 2019-06-13 10:09:20 +02:00
Laurent Destailleur
2bc821d900
Try to keep proportions of logo 2019-06-13 10:08:35 +02:00
Laurent Destailleur
1318e26cda
Merge pull request #11298 from hregis/7.0_price 
FIX missing compatibility with multicompany transverse mode
 2019-06-13 10:01:05 +02:00
Laurent Destailleur
4cbfb67d63
Update html.formother.class.php 2019-06-13 09:59:10 +02:00
Francis Appels
989cf823dd Fix scrutinizer 2019-06-12 22:55:08 +02:00
Francis Appels
3f63be6045 fix typo 2019-06-12 22:10:40 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d Fix look and field v10 2019-06-12 19:03:22 +02:00
Laurent Destailleur
e81663ec34 Fix cropping of image files for BOM module was ko 2019-06-12 19:00:34 +02:00
Laurent Destailleur
d4aa0bfa94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-12 15:42:58 +02:00
Laurent Destailleur
47610d0323 Look and feel v10 2019-06-12 15:42:48 +02:00
Laurent Destailleur
c0949e3cf9
Merge pull request #11175 from aspangaro/10.0_Differentiated_export 
NEW Accountancy - Differentiated export
 2019-06-12 15:42:20 +02:00
Francis Appels
1688bc3f7e Merge branch '10' into clean_10_beta 2019-06-12 14:38:25 +02:00
Laurent Destailleur
a7e0589071 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:22 +02:00
Laurent Destailleur
c57013f293 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:14 +02:00
Laurent Destailleur
bf6f9dd7ea Fix phpcs 2019-06-12 13:58:48 +02:00
Laurent Destailleur
44f383c8b9 Fix data lost when creation in error 2019-06-12 13:57:34 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
3ad36a51db
Merge pull request #11312 from aspangaro/10.0_b1 
Look and feel v10
 2019-06-12 13:11:27 +02:00
Laurent Destailleur
475f59cc2a
Update annuel.php 2019-06-12 13:10:17 +02:00
Laurent Destailleur
9d95812495
Update bankentries_list.php 2019-06-12 13:08:26 +02:00
Laurent Destailleur
509ca489b2
Update card.php 2019-06-12 13:06:02 +02:00
Laurent Destailleur
aaed26b9b0
Update main.lang 2019-06-12 13:04:28 +02:00
Laurent Destailleur
9fa6674e3f
Update list.php 2019-06-12 13:03:54 +02:00
Laurent Destailleur
1e87635e8e
Update sellsjournal.php 2019-06-12 13:02:59 +02:00
Laurent Destailleur
eefd30fe1c
Update purchasesjournal.php 2019-06-12 13:01:04 +02:00
Laurent Destailleur
42915d86ec
Update expensereportsjournal.php 2019-06-12 12:57:02 +02:00
Laurent Destailleur
a400183bf1
Update bankjournal.php 2019-06-12 12:52:51 +02:00
Laurent Destailleur
f435f4bd6a
Update bankjournal.php 2019-06-12 12:49:44 +02:00
Laurent Destailleur
402cbba4ad
Update bankjournal.php 2019-06-12 12:48:21 +02:00
Laurent Destailleur
3aacd45437
Update list.php 2019-06-12 12:47:35 +02:00
Laurent Destailleur
1182c0d1f5
Update list.php 2019-06-12 12:46:44 +02:00
Laurent Destailleur
0f3db439fe
Update bankjournal.php 2019-06-12 12:38:01 +02:00
Laurent Destailleur
4f5f03b893
Merge pull request #11326 from atm-greg/FIX_massaction_presend 
Fix massaction presend
 2019-06-12 12:37:03 +02:00
Laurent Destailleur
0bf7512f28
Update actions_massactions.inc.php 2019-06-12 12:33:31 +02:00
atm-greg
47746fd17d fix template type 2019-06-12 12:30:49 +02:00
Laurent Destailleur
27a5f1172b
Merge pull request #11322 from aspangaro/10.0_b3 
FIX Define company opening hours information
 2019-06-12 12:12:02 +02:00
Laurent Destailleur
5554bd231f
Update openinghours.php 2019-06-12 12:11:06 +02:00
Laurent Destailleur
32849db6d8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-12 12:10:07 +02:00
Laurent Destailleur
91a4e8bc0a Merge 2019-06-12 12:09:56 +02:00
atm-greg
9ba102b6b9 bad object used 2019-06-12 12:08:16 +02:00
atm-greg
25031e534d fix massaction presend 2019-06-12 12:05:02 +02:00
Laurent Destailleur
6d5637c389 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/actions_massactions.inc.php
 2019-06-12 12:03:46 +02:00
Alexandre SPANGARO
92f7122d32 Merge branch '10.0' into 10.0_b3 2019-06-12 11:33:22 +02:00
Laurent Destailleur
afe1ec633b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:21 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Laurent Destailleur
1b6b471cb7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:43 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab FIX #11316 2019-06-12 10:05:53 +02:00
Laurent Destailleur
826ad1be09
Merge pull request #11313 from atm-florian/10.0 
add missing column birthday adherent list
 2019-06-12 09:23:18 +02:00
Laurent Destailleur
1645918a94
Merge pull request #11318 from aspangaro/10.0_b2 
Accountancy : Fix language key
 2019-06-12 09:18:24 +02:00
Alexandre SPANGARO
eb4dc36e05 Responsive on invoice index 2019-06-12 04:56:16 +02:00
Alexandre SPANGARO
293048f9fb NEW Define company opening hours information 2019-06-11 22:10:28 +02:00
Laurent Destailleur
2ac8723ce9 Code comment 2019-06-11 21:02:41 +02:00
Alexandre SPANGARO
b079a8ba64 Minwidth100 on amount 2019-06-11 05:03:48 +02:00
Alexandre SPANGARO
a96b10db62 Fix label country on bind list 2019-06-11 05:00:47 +02:00
Alexandre SPANGARO
c5ff0894be Accountancy : Fix language key 2019-06-10 22:10:49 +02:00
Laurent Destailleur
a72e36cd01 Fix show version removed from left menu 2019-06-10 20:05:49 +02:00
Maxime Kohlhaas
0ce2c2aab5 Fix missing massaction hook params 2019-06-10 10:11:26 +02:00
florian HENRY
cab91e75c6 add missing column adherent list 2019-06-10 10:10:16 +02:00
Alexandre SPANGARO
f3cba86282 Better look 2019-06-10 07:49:10 +02:00
Alexandre SPANGARO
6d43efb4a2 Align right 2019-06-09 16:35:45 +02:00
Alexandre SPANGARO
8c5a01dd90 Show total with decimals 2019-06-09 08:56:49 +02:00
Alexandre SPANGARO
33b02b97d5 Better look 2019-06-09 08:50:20 +02:00
Alexandre SPANGARO
ae686ff62a Better look 2019-06-09 08:39:38 +02:00
Alexandre SPANGARO
a0ab2fdfd7 Fix Missing language key 2019-06-09 08:29:44 +02:00
Alexandre SPANGARO
39fa4f9365 Fix Missing language key 2019-06-08 21:34:30 +02:00
Laurent Destailleur
d8259d9db1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/card.php
 2019-06-07 22:59:59 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:58:58 +02:00
Laurent Destailleur
1b77d2f10b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 22:56:58 +02:00
Laurent Destailleur
f713deb0a8 Fix sql syntax error 2019-06-07 22:55:51 +02:00
Laurent Destailleur
0099c1f602 Fix missing date 2019-06-07 22:55:18 +02:00
Laurent Destailleur
e862f4c81d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 22:53:38 +02:00
Laurent Destailleur
0a903da5dc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:53:30 +02:00
Laurent Destailleur
49646663a1 Fix link on invoice 2019-06-07 22:47:15 +02:00
Laurent Destailleur
91a5547362
Merge pull request #11307 from frederic34/patch-7 
Warning: A non-numeric value encountered
 2019-06-07 18:11:09 +02:00
Laurent Destailleur
b36f80ab2e
Merge pull request #11306 from frederic34/patch-6 
Parameter must be array or object that implements Countable
 2019-06-07 18:10:03 +02:00
Laurent Destailleur
b73d287953
Update agenda.lib.php 2019-06-07 18:09:43 +02:00
Francis Appels
2ecde139f0 Fix stock mouvement does not need virtual stock. 2019-06-07 18:09:03 +02:00
Laurent Destailleur
99ad8d5fb4
Merge pull request #11305 from fappels/develop_stock_performance 
FIX stock movement does not need virtual stock.
 2019-06-07 18:08:35 +02:00
Laurent Destailleur
4c44378049 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 16:56:39 +02:00
Laurent Destailleur
73326cfbf9 Removed bad commited files 2019-06-07 16:56:08 +02:00
Josep Lluís
bb0313a1a4 Fix Hide disabled fields 
Hide disabled fields in product list
 2019-06-07 15:23:20 +02:00
Laurent Destailleur
58f85ae988
Merge pull request #11304 from joseplluis/patch-6 
FIX Hide disabled fields in product list
 2019-06-07 15:22:36 +02:00
Laurent Destailleur
0edd94c4f8
Merge pull request #11303 from atm-florian/10.0 
fix various little stuff from scrutinizer (undeclared vriable, misspelling variable, mistype declaration)
 2019-06-07 15:21:30 +02:00
Laurent Destailleur
ed2d9435db
Update project.class.php 2019-06-07 15:21:15 +02:00
Laurent Destailleur
22d98c0ccb
Merge pull request #11300 from ptibogxiv/patch-185 
FIX contact default list with adding job/function
 2019-06-07 15:15:52 +02:00
ptibogxiv
63e205c23f FIX term of lang for explicit date in subscription list 2019-06-07 15:15:05 +02:00
Laurent Destailleur
ffb61034d5
Merge pull request #11299 from ptibogxiv/patch-184 
FIX term of lang for explicit date in subscription list
 2019-06-07 15:14:09 +02:00
Laurent Destailleur
4ed7e281c5
Merge pull request #11301 from frederic34/patch-5 
avoid warning with php 7.2
 2019-06-07 15:08:49 +02:00
Laurent Destailleur
e606092376
Merge pull request #11311 from OPEN-DSI/fix-expedition-fecth-date-valid 
Fix fetch date valid in expedition object
 2019-06-07 15:08:29 +02:00
Laurent Destailleur
63d9e963b8
Merge pull request #11310 from atm-josselin/FIX_display_intervention_model_button 
Display the intervention button only in develop mode
 2019-06-07 15:08:07 +02:00
Laurent Destailleur
235a65e7a8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 14:21:11 +02:00
Laurent Destailleur
1520ca9646 Fix buttons for payments 2019-06-07 13:51:53 +02:00
Laurent Destailleur
9314bb4667 Fix missing statement descriptor 2019-06-07 13:07:19 +02:00
Laurent Destailleur
9511a66681 Integrate the new Stripe checkout with STRIPE_USE_NEW_CHECKOUT=1 2019-06-07 12:41:37 +02:00
Laurent Destailleur
dc479a5377 FIX Create stripe intent only if Stripe was selected. This reduce also 
duplicate code.
FIX Free payment when using paymentintent architecture.
 2019-06-07 11:29:59 +02:00
Laurent Destailleur
eb0d04f304 Code comment 2019-06-07 11:24:35 +02:00
Lionel VESSILLER
f9d12f9397 Fix fetch date valid in expedition object 2019-06-07 10:55:46 +02:00
Laurent Destailleur
a0a0c2207b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 01:29:55 +02:00
Laurent Destailleur
3d8910d327 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-06-06 19:19:05 +02:00
Laurent Destailleur
deb9ac25a8 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-06-06 19:08:26 +02:00
Laurent Destailleur
3ff154c1d0 Fix sql error 2019-06-06 19:05:47 +02:00
Laurent Destailleur
e5754519cb Fix doxygen 2019-06-06 18:57:57 +02:00
Laurent Destailleur
20a388e8d7 Fix init of module 2019-06-06 18:55:24 +02:00
atm-josselin
c8ab7dee45 Display the intervention button only in develop mode 2019-06-06 16:34:44 +02:00
florian HENRY
beb2a0131c fix travis 2019-06-06 16:11:12 +02:00
Maxime Kohlhaas
9c7c1ddceb Fix multicurrency setup page 2019-06-06 11:20:10 +02:00
Frédéric FRANCE
ad95b66842
Warning: A non-numeric value encountered 2019-06-06 10:12:01 +02:00
Frédéric FRANCE
f11db8396a
Parameter must be array or object that implements Countable 
warning with php 7.2
 2019-06-06 09:49:32 +02:00
Francis Appels
2e0539efa7 Fix stock mouvement does not need virtual stock. 2019-06-05 19:06:58 +02:00
Josep Lluís
7b4843ca0b
Fix Hide disabled fields 
Hide disabled fields in product list
 2019-06-05 17:48:48 +02:00
florian HENRY
21f6daae2a fix scrunitizer 2019-06-05 17:38:10 +02:00
florian HENRY
d98ce172ad multicurrency:fix display error message on failed update 2019-06-05 17:26:37 +02:00
florian HENRY
f2171d466b fix variable name 2019-06-05 17:05:26 +02:00
florian HENRY
acad2e633b fix scrutinzer 2019-06-05 16:34:32 +02:00
florian HENRY
3927a74d6b fix scrunitizer 2019-06-05 16:30:22 +02:00
florian HENRY
e1392466cf Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2019-06-05 16:10:20 +02:00
florian HENRY
1cf38fa635 fix scrutinizer 2019-06-05 16:08:04 +02:00
florian HENRY
45270786f9 fix scrutinizer 2019-06-05 16:06:55 +02:00
florian HENRY
18d7e15a23 fix scrutinizer 2019-06-05 16:03:42 +02:00
florian HENRY
d77de256ce fix scrutinizer 2019-06-05 16:01:02 +02:00
florian HENRY
c5afc3131f fix variable name 2019-06-05 15:59:35 +02:00
florian HENRY
1d4962cf81 fix scrutinizer 2019-06-05 15:57:16 +02:00
Frédéric FRANCE
ca6a624112
avoid warning with php 7.2 2019-06-05 13:55:47 +02:00
Laurent Destailleur
73d60e6606 Look and feel v10 2019-06-05 12:16:55 +02:00
Laurent Destailleur
8ef7a3abf2 Clean demofile for v10 2019-06-05 11:56:57 +02:00
Laurent Destailleur
d3d0ce4649 Better error message when missing grant privileges 2019-06-05 10:42:59 +02:00
Laurent Destailleur
06e0ec5e0c Fix link 2019-06-05 08:26:08 +02:00
Laurent Destailleur
e3812e3b0c FIX source template invoice not loaded/shown 2019-06-05 08:20:10 +02:00
Laurent Destailleur
c200ec22da Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-06-05 08:17:28 +02:00
Laurent Destailleur
5451d72900 FIX source template invoice not loaded/shown 2019-06-05 08:08:31 +02:00
Laurent Destailleur
700de33f04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-04 20:07:07 +02:00
Laurent Destailleur
a70a14b145 Fix migration 2019-06-04 20:06:44 +02:00
Laurent Destailleur
75e3a184e0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-04 20:04:26 +02:00
Laurent Destailleur
0c331602e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-04 20:03:51 +02:00
Laurent Destailleur
ab77051317 Fix time delay for purge 2019-06-04 20:03:27 +02:00
Laurent Destailleur
a08dcec7fc Fix doc 2019-06-04 20:02:29 +02:00
Laurent Destailleur
4a63c6d38a Fix phpcs 2019-06-04 19:20:08 +02:00
Laurent Destailleur
9c4f9c91df Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-04 19:18:43 +02:00
Laurent Destailleur
210b2f37dc Fix error message 2019-06-04 19:18:20 +02:00
Laurent Destailleur
1229f64632 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-04 19:04:33 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
Laurent Destailleur
ba68e3d7ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/website/class/website.class.php
 2019-06-04 18:47:22 +02:00
Laurent Destailleur
36df2f1026 Fix css 2019-06-04 18:45:01 +02:00
ptibogxiv
70d9d3ab4c
FIX contact default list with adding job/function 
as my last commit it's same contact but  différent job / function. More clear for choosing right contact in the list (PR from my dolibarr's customer)
 2019-06-04 18:23:25 +02:00
Laurent Destailleur
7b3242693b FIX default value for duration of validity can be set from generic 
feature.
 2019-06-04 18:17:07 +02:00
ptibogxiv
36bc5024e8
FIX term of lang for explicit date in subscription list 2019-06-04 16:22:43 +02:00
Laurent Destailleur
79a3e41418 Hook 'getAccessForbiddenMessage' 2019-06-04 12:48:06 +02:00
Laurent Destailleur
969e139d5c Fix parameters of accessforbidden 2019-06-04 12:21:27 +02:00
Laurent Destailleur
2c04a480a2 Fix phpcs 2019-06-04 02:31:19 +02:00
Laurent Destailleur
fd50e68f9a Fix look and feel v10 2019-06-04 02:15:52 +02:00
Laurent Destailleur
ba2b07917b Fix look and feel v10 2019-06-04 02:11:03 +02:00
Laurent Destailleur
cb859b7dfb Look and feel v10 2019-06-04 01:30:17 +02:00
Laurent Destailleur
29d9983669 Fix look and feel v10 2019-06-04 01:22:26 +02:00
Laurent Destailleur
664e0b81d8 Debug module BOM 2019-06-03 22:07:34 +02:00
Laurent Destailleur
b526f7da43 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-03 20:47:12 +02:00
Laurent Destailleur
a143dba9f8 Work on incomplete code on BOM module 2019-06-03 20:46:11 +02:00
Laurent Destailleur
7d2cedfdcf Debug bom module 2019-06-03 19:29:49 +02:00
Laurent Destailleur
72f55e1d81 Debug modulebuilder 2019-06-03 18:11:53 +02:00
Regis Houssin
5726b40a10 FIX try to use WHERE EXISTS instead DISTINCT 2019-06-03 17:26:03 +02:00
Regis Houssin
7fd1051efc FIX missing compatibility with multicompany transverse mode 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-03 17:22:15 +02:00
Laurent Destailleur
6c6c353177 Prepare 10.0 2019-06-03 16:47:43 +02:00
Laurent Destailleur
65b702d854 responsive 2019-06-03 16:37:31 +02:00
Laurent Destailleur
8ef209bc04 Fix responsive 2019-06-03 16:30:49 +02:00
Laurent Destailleur
213936aac1 Fix combo 2019-06-03 16:20:04 +02:00
Regis Houssin
43ada3fcd4 FIX better method to check if pdf is protected/encrypted 2019-06-03 09:36:00 +02:00