lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,192 Commits 43 Branches 150 Tags 886 MiB
523d09536c
Commit Graph

68516 Commits

Author SHA1 Message Date
Laurent Destailleur
ed8b6f346d
Merge pull request #12946 from OPEN-DSI/v10-fix-categorie-full-arbo-match 
FIX regex for include or exclude categories in full arbo
 2020-01-28 20:39:22 +01:00
Laurent Destailleur
4730da94ab
Merge pull request #12943 from OPEN-DSI/v10-fix-extrafiled-category-require 
FIX require category class in extrafield
 2020-01-28 20:37:35 +01:00
Laurent Destailleur
782be2ac37 FIX Invert isSellerInEEC and isBuyerInEEC 2020-01-28 17:50:08 +01:00
Laurent Destailleur
bffdc63ec6 FIX The "automatic bind" was linked EEC to export accountancy code 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2020-01-28 17:48:34 +01:00
VESSILLER
8af5d87e80 FIX regex for include or exclude categories in full arbo 2020-01-28 17:13:09 +01:00
VESSILLER
7cdd334995 FIX require category class in extrafield 2020-01-28 11:37:23 +01:00
Laurent Destailleur
751247d3f3
Merge pull request #12935 from mapiolca/patch-24 
Fix link direction for late supplier invoices
 2020-01-28 02:59:25 +01:00
Pierre Ardoin
4cb423e5c7
Add un specific link to late invoices 
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
 2020-01-27 09:49:49 +01:00
Pierre Ardoin
e0c8fce229
Fix link direction for late supplier invoices 
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid supplier invoices.
 2020-01-27 09:39:38 +01:00
Laurent Destailleur
ecaacc9543 FIX #12875 2020-01-26 23:27:47 +01:00
Laurent Destailleur
2e7c615e80
Merge pull request #12928 from atm-greg/FIX_10.0_date_filters_on_contract_service_list 
FIX date filter not used if no operator
 2020-01-26 22:33:42 +01:00
Laurent Destailleur
64fab28648
Merge pull request #12926 from atm-greg/FIX_10.0_form_reload_on_country_id_change 
fix lost name_alias on country selection
 2020-01-26 22:33:12 +01:00
Laurent Destailleur
57bbe66612
Merge pull request #12929 from atm-gauthier/10.0_orderby_extrafieldsinexport 
FIX : Extrafield position in export field list must respect "pos" field
 2020-01-26 22:30:02 +01:00
Laurent Destailleur
14f1f98b59
Merge pull request #12919 from atm-florian/10_fixCreateSEPALimitAndPagination 
10 fix create sepa limit and pagination
 2020-01-26 22:24:11 +01:00
Pierre Ardoin
c64acb1a9c
Permissions Issue 
fixes an issue that displayed the "restricted area" banner despite user permissions.
 2020-01-25 15:19:46 +01:00
gauthier
4222639702 FIX : Extrafield position in export field list must respect "pos" field 2020-01-24 15:32:59 +01:00
atm-greg
f63893a90c FIX date filter not used if no operator 2020-01-24 15:10:57 +01:00
atm-greg
f5395fa859 fix lost name_alias on country selection 2020-01-24 14:28:08 +01:00
florian HENRY
62caf3cbfc fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:59:50 +01:00
florian HENRY
5ad5578f40 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:47:00 +01:00
florian HENRY
210e0511d0 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:45:16 +01:00
Laurent Destailleur
8030558117 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:34:40 +01:00
Laurent Destailleur
42769e2e7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
 2020-01-23 12:07:17 +01:00
Laurent Destailleur
cbe396b97c
Update functions2.lib.php 2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082
Update functions2.lib.php 2020-01-23 12:02:29 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
381f2d5eee Fix typo 2020-01-22 16:24:16 +01:00
Laurent Destailleur
7964699674 FIX Check on unicity on prof id was not triggered sometimes 2020-01-22 16:22:53 +01:00
Laurent Destailleur
28d0b85b84 Fix phpcs 2020-01-22 14:56:19 +01:00
Laurent Destailleur
2caa4e9fa6
Merge pull request #12885 from leninrivas/10.0 
FIX Missing Linked objects Fichinter Ref. in PDF formats
 2020-01-22 14:17:25 +01:00
Laurent Destailleur
cb41168904
Merge pull request #12889 from mapiolca/patch-21 
Fix double display of create credit note button
 2020-01-22 13:57:47 +01:00
Laurent Destailleur
0c4e736e13
Merge pull request #12893 from aspangaro/10.0_p33 
Fix : Accounting - error on right
 2020-01-22 13:54:45 +01:00
Laurent Destailleur
d141d9516b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-22 13:53:31 +01:00
Laurent Destailleur
fc894d7a20 Fix for stripe connect 2020-01-22 13:53:20 +01:00
Laurent Destailleur
3d474d5174
Merge pull request #12902 from ptibogxiv/patch-293 
fix stripe/charge.php for connect mode with payment intent
 2020-01-22 13:53:04 +01:00
Laurent Destailleur
999e363446
Update charge.php 2020-01-22 13:52:37 +01:00
Laurent Destailleur
3bd4580e9b
Merge pull request #12904 from OPEN-DSI/v10-product-unit-length-update 
FIX length, width and height units coherence in product table
 2020-01-22 13:48:18 +01:00
Laurent Destailleur
e96ef17737
Merge pull request #12903 from atm-john/10.0_fix_dom_and_missing_param 
FIX dom and missing param
 2020-01-22 13:45:06 +01:00
Laurent Destailleur
443e4e2223
Update html.form.class.php 2020-01-22 13:44:42 +01:00
VESSILLER
c91ab621b8 FIX length, width and height coherence in product table 2020-01-21 17:49:27 +01:00
John Botella
d6766af35d Fix dom and missing param 2020-01-21 14:17:53 +01:00
ptibogxiv
b4758295e1
fix stripe/charge.php for connect mode with payment intent 2020-01-21 10:59:57 +01:00
Alexandre SPANGARO
f4cd3236b1 Fix : Accounting - error on right 2020-01-19 21:59:01 +01:00
Pierre Ardoin
e4eb8883fe
Fix double display of create credit note button 
Before: Display of the "Create credit note" button twice for standard invoices when situation invoices are activated.
After: Displays a single button "Create a credit note"
 2020-01-19 19:10:10 +01:00
Laurent Destailleur
041d5aeb46 FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:55:22 +01:00
Laurent Destailleur
6a958dd45b FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:51:37 +01:00
Laurent Destailleur
00cddc39fd Fix remove some orphelins in llx_ecm_files 2020-01-19 13:56:16 +01:00
Laurent Destailleur
8bc8a8f57c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-19 12:16:33 +01:00
Laurent Destailleur
f4ae869678 Fix error return when creating order with not enough stock 2020-01-19 12:15:47 +01:00
Laurent Destailleur
cf2001a1ae
Merge pull request #12860 from atm-ph/fix_10.0_html_text 
Fix note started with <s> balise
 2020-01-17 14:51:09 +01:00
VESSILLER
60d4f63205 FIX send expense report mail in HTML format 2020-01-17 13:56:01 +01:00
atm-ph
3cdb84b192 Fix note started with <s> balise 2020-01-16 09:50:57 +01:00
John Botella
10c973f38f Fix complex export model loading 2020-01-15 14:36:44 +01:00
Laurent Destailleur
0a1a07aa22
Merge pull request #12839 from atm-gauthier/10.0_fix_importSocieteWithExtrafields 
FIX : We want to be able to import data for extrafields of entity 0 too
 2020-01-15 13:12:56 +01:00
Laurent Destailleur
b4a309a251 Prepare 10.0.7 2020-01-15 12:00:25 +01:00
Laurent Destailleur
0442105bd4 Fix Generation of zip of module 2020-01-15 11:55:27 +01:00
gauthier
5455130a03 FIX : We want to be able to import data for extrafields of entity 0 too 2020-01-13 16:15:22 +01:00
Laurent Destailleur
efb506ba7f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-10 13:51:35 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
 2020-01-10 13:51:29 +01:00
Laurent Destailleur
b93247aeec
Merge pull request #12819 from atm-arnaud/FIX_stats_invoices_with_draft 
FIX drafts are now implemented for stats
 2020-01-10 00:15:13 +01:00
Laurent Destailleur
bc8dfd46c2
Merge pull request #12810 from ATM-Consulting/10.0_Fix_folder_rename_behavior 
Fix folder rename behavior
 2020-01-10 00:11:47 +01:00
atm-arnaud
ae4554af65 FIX drafts are now implemented for stats 2020-01-08 11:27:52 +01:00
Dev2a
57c954f2e8 Fix Check array of action after kooks 2020-01-07 21:41:36 +01:00
Dev2a
2d67c2365f Fix Check right for service for arrayofmassaction 
if product module disable, threre is no action for service
 2020-01-07 18:59:58 +01:00
John Botella
36ccb8b08e Fix folder rename behavior 2020-01-07 14:49:25 +01:00
ptibogxiv
5a1f123994
Update societe.class.php 2020-01-07 13:10:10 +01:00
ptibogxiv
e820af4aa0
FIX: multicompany for discount 2020-01-07 13:07:36 +01:00
Laurent Destailleur
cc4c2d8a0b Prepare 10.0.6 2020-01-05 20:39:45 +01:00
Laurent Destailleur
eca91af2ca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-04 14:21:56 +01:00
Laurent Destailleur
7853427bb1 FIX product with empty stock were not visible 2020-01-04 14:21:38 +01:00
Laurent Destailleur
0dafbd194f
Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending 
FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
 2020-01-03 20:56:59 +01:00
Laurent Destailleur
37f9307732
Update product.class.php 2020-01-03 20:53:49 +01:00
Laurent Destailleur
88d97104be
Merge pull request #12789 from aspangaro/10.0_p32 
FIX Some problems on conciliation with others modules
 2020-01-03 20:47:33 +01:00
Laurent Destailleur
e178d38bf8
Merge pull request #12791 from ptocquin/patch-1 
Update api_supplier_invoices.class.php
 2020-01-03 20:42:55 +01:00
Laurent Destailleur
e83b71f271
Merge pull request #12787 from aspangaro/10.0_p30 
FIX Loan card - Wrong language key used
 2020-01-03 20:42:01 +01:00
Laurent Destailleur
b452fc8442
Merge pull request #12788 from aspangaro/10.0_p31 
FIX typo on language key
 2020-01-03 20:41:04 +01:00
Pierre Tocquin
8a5f3d48f4
Update api_supplier_invoices.class.php 
Correction test data 'date'  lors de la création d'une facture fournisseur. `array_keys` remplacé par `array_key_exists` dans la clause `if`. Cette clause est correcte dans api_invoices.class.php.
 2020-01-03 19:18:24 +01:00
Pierre Ardoin
79458ac139
FIX an issue that shows all entities stock 
Before : If products are shared between several entities, the stock of each entity are to add in this page (reassort.php)
 
Now : Each entity see only her stock and not other's stock.
 2020-01-03 18:05:49 +01:00
Alexandre SPANGARO
f14aaf5e50 FIX Some problems on conciliation with others modules 2020-01-03 16:35:02 +01:00
Alexandre SPANGARO
93d87d581b FIX typo on language key 2020-01-03 14:56:49 +01:00
Alexandre SPANGARO
67316c9125 FIX Loan card - Wrong language key used 2020-01-03 14:38:25 +01:00
Laurent Destailleur
103f41f571 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-31 18:22:34 +01:00
Laurent Destailleur
d2efe1d427 Fix SQL injection on type parameter in list of events 2019-12-31 17:52:28 +01:00
Laurent Destailleur
31c5f4eb0b
Merge pull request #12748 from OPEN-DSI/v10-fix-projet-element-linkto 
FIX remove backward compatibility projectid and uses object id instead
 2019-12-31 17:40:01 +01:00
Laurent Destailleur
ff1c96f985
Merge pull request #12753 from aspangaro/10.0_p9 
FIX : Some issues on salary payment
 2019-12-31 17:39:08 +01:00
Laurent Destailleur
4c6c8e172f
Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class 
Revert "FIX class Facture undefined in displaying margin information"
 2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04 FIX #12760 #12763 #12755 #12765 #12751 2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae
Revert "FIX class Facture undefined in displaying margin information" 2019-12-31 17:26:02 +01:00
Laurent Destailleur
10d6d00c17
Merge pull request #12749 from OPEN-DSI/v10-fix-admin-dict-transkey-not-defined 
FIX var transkey not defined in input hidden
 2019-12-30 22:01:16 +01:00
Laurent Destailleur
6e90e81be1
Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class 
FIX class Facture undefined in displaying margin information
 2019-12-30 22:00:28 +01:00
Laurent Destailleur
b067653070
Merge pull request #12757 from aspangaro/10.0_p12 
FIX Missing language key for MAIN_MAXTABS_IN_CARD
 2019-12-30 21:59:32 +01:00
Laurent Destailleur
aa390b8c3c
Merge pull request #12771 from tuxgasy/10.0_Fix_double_value_on_update_object 
Fix decimal value on update object
 2019-12-30 21:50:53 +01:00
Laurent Destailleur
e2c7ee7d09
Merge pull request #12772 from hregis/10.0_mc 
FIX wrong var name and avoid warning
 2019-12-30 21:48:56 +01:00
Laurent Destailleur
5a34874b0a
Merge pull request #12752 from OPEN-DSI/v10-fix-project-element-task-urlnew 
FIX url new for task time spent in project element tab
 2019-12-30 21:47:26 +01:00
Regis Houssin
71a2998118 FIX wrong var name and avoid warning 2019-12-30 15:36:09 +01:00
TuxGasy
c9cc6cbbea Fix decimal value on update object 2019-12-29 23:15:49 +01:00
Alexandre SPANGARO
a804208b32 Fix missing language key 2019-12-27 20:54:47 +01:00