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

73840 Commits

Author SHA1 Message Date
Laurent Destailleur
27542ed8ed
Update prelevement.php 2020-12-17 13:53:09 +01:00
Laurent Destailleur
36d6b472ce
Update prelevement.php 2020-12-17 13:52:03 +01:00
Haldarys
10ac74162e Fix PRELEVEMENT_ADDDAYS check 
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
 2020-12-17 10:19:21 +01:00
Laurent Destailleur
7886a6e838 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-13 15:06:54 +01:00
Alexandre SPANGARO
35b3d4f40a FIX: Export FEC - Force Carriage Return Line Feed 2020-12-13 14:11:04 +01:00
Ferran Marcet
7360fcd03e FIX: Bad rigths to send contract 2020-12-10 13:11:55 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
 2020-12-08 18:11:39 +01:00
Alexandre SPANGARO
7c77a0d84b FIX : Export FEC - Remove line at zero 2020-12-07 23:53:09 +01:00
Francis Appels
223205cf9d Fix volume calcution, depends on surface not surface_units 
surface_unit can be 0 for m2
 2020-12-04 16:54:40 +01:00
Alexandre SPANGARO
0a24298385 FIX: Problem on supplier payment card 2020-12-04 02:57:40 +01:00
Laurent Destailleur
0ad6ee209a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-03 11:21:08 +01:00
Frédéric FRANCE
69ea0ea791
Update box_produits.php 2020-11-23 23:44:15 +01:00
Frédéric FRANCE
c7d886c918
fix status on tooltip in box last product 2020-11-23 23:25:09 +01:00
Maxime Kohlhaas
44c5988853 Fix #15377 ticket list filter on author 2020-11-15 10:42:15 +01:00
Frédéric FRANCE
ad05451427
Fix missing getpost for scandir odt path 2020-11-12 11:23:03 +01:00
quentin
fb27c98f9c FIX : handling $heightforinfotot when he's superior to a page height 2020-11-10 09:40:45 +01:00
Laurent Destailleur
8458025e1d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-09 19:47:33 +01:00
Laurent Destailleur
4a5c7d299f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-11-09 19:47:25 +01:00
Alexandre SPANGARO
0a078da8e4 FIX: Accountancy - Some ajustments on length of the account 2020-11-09 14:59:29 +01:00
Alexandre SPANGARO
617c930574 FIX: Accountancy - Some ajustments on length of the account (general & auxiliary) 2020-11-09 14:13:09 +01:00
Got2be
2f11f4e104 FIX : disabled users must not be available in sales representative list on societe edit mode 2020-11-09 11:22:07 +01:00
atm-lena
047785b273 FIX - Don't display inactive users in birthday box and soc card 2020-11-06 11:58:36 +01:00
Laurent Destailleur
6bb598498e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-05 09:42:51 +01:00
Laurent Destailleur
f25a6b2e67
Merge pull request #15213 from ATM-Consulting/fix/10.0_delete_action_from_redirect_url_when_reordering_lines 
FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines
 2020-11-02 09:41:00 +01:00
Florian Mortgat
400acf9f65 FIX - 10.0 - regex to remove 'action' parameter: taking feedback from PR#15213 into account 2020-11-02 08:26:36 +01:00
Laurent Destailleur
d9ca9fe22d Fix clean of contract 2020-10-30 14:50:38 +01:00
Laurent Destailleur
f51b02026c Fix regression 2020-10-30 04:24:06 +01:00
Laurent Destailleur
f5a156ee06 Fix regression 2020-10-30 04:17:02 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
Laurent Destailleur
925669ee33 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-30 03:25:52 +01:00
Laurent Destailleur
f22017080d Fix for php8 2020-10-30 03:25:33 +01:00
Laurent Destailleur
e79a061c19
Merge pull request #15204 from frederic34/patch-6 
Update timeline.inc.php
 2020-10-29 17:46:31 +01:00
Laurent Destailleur
d7225327e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-29 11:13:29 +01:00
Laurent Destailleur
2a386b6fea Fix set subledger account 2020-10-29 11:13:18 +01:00
Laurent Destailleur
91cf5de54d Fix bad sort order 2020-10-29 11:06:18 +01:00
Laurent Destailleur
980cb095da Fix sort order use last sortorder if several fields. 2020-10-29 11:05:43 +01:00
Florian Mortgat
5e2962ef38 FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines on a document 2020-10-29 10:50:13 +01:00
Laurent Destailleur
b1b7a7c725 Fix missing transaction 2020-10-29 10:40:50 +01:00
Laurent Destailleur
c3f0f3cc4a
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback" 2020-10-29 10:36:48 +01:00
Frédéric FRANCE
20c00d0c43
Update timeline.inc.php 2020-10-28 17:54:45 +01:00
Florian Mortgat
a4af2e94a9 FIX 10.0 - make formConfirm an addreplace-type hook 2020-10-28 17:08:09 +01:00
Marc de Lima Lucio
a33d34a165 FIX: various payments: bad data handling for subledger account + useless db commit/rollback 2020-10-27 16:48:56 +01:00
Frédéric FRANCE
da4f3fab14
dol_print_date called with a bad value 2020-10-27 08:10:19 +01:00
Laurent Destailleur
12289ceb9e
Merge pull request #15159 from Ahuahuachi/10.0 
FIX #15111 Fix special characters output in PDF
 2020-10-26 19:20:53 +01:00
Laurent Destailleur
e57cd74f22
Merge pull request #15166 from atm-quentin/FIX_select2_extra_witdh_on_advtargetmailing 
FIX table making extrafield input too small on advance target mailing
 2020-10-26 19:11:37 +01:00
Laurent Destailleur
78a52eda96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/main.inc.php
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:05:30 +01:00
Laurent Destailleur
50ede5224a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-26 19:02:47 +01:00
Laurent Destailleur
c58d3d0cf7 FIX #15163 2020-10-26 19:02:26 +01:00
Laurent Destailleur
3ee618d736 FIX Clean orphan records in llx_ecm_files into repair script. 2020-10-26 18:31:12 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
Marc de Lima Lucio
3f839c2a96 FIX: product customer prices: missing triggers in CRUD class 2020-10-26 16:11:21 +01:00
quentin
fd1f5bbe01 FIX table making extrafield too small advtagertmailing 2020-10-26 15:03:32 +01:00
quentin
5694a19c6a FIX table making extrafield input too small advtargetmailing 2020-10-26 14:51:13 +01:00
Alfredo Altamirano
1b82b6af4d FIX #15111 Fix special characters output in PDF 2020-10-25 22:17:02 -06:00
Laurent Destailleur
baa86d773b Fix phpcs 2020-10-25 21:07:37 +01:00
Laurent Destailleur
02ef5ad3b9
Merge pull request #15144 from atm-maxime/fix_supp_inv_numbering 
Fix #15064 : error when supplier invoice numbering module is not configured
 2020-10-25 13:58:48 +01:00
Laurent Destailleur
b6db71e5e6
Merge pull request #15146 from atm-maxime/fix_selected_lines_invoice_creation 
Fix #15143 selected lines on invoice creation
 2020-10-25 13:57:00 +01:00
Maxime Kohlhaas
309691f1e7 Fix #15143 selected lines on invoice creation 2020-10-25 09:28:41 +01:00
Maxime Kohlhaas
680ae60b6f Fix #15064 : error when supplier invoice numbering module is not configured 2020-10-25 08:56:34 +01:00
Maxime Kohlhaas
7080c8491d Fix var name in contract box 2020-10-24 19:46:57 +02:00
Laurent Destailleur
cf4ea4168d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-10-23 17:33:14 +02:00
Laurent Destailleur
377c44eeab
Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required 
FIX no empty value in required extrafield
 2020-10-23 17:29:12 +02:00
Laurent Destailleur
62420c5e7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2020-10-23 03:51:22 +02:00
Laurent Destailleur
e0e4da481a Fix phpcs 2020-10-23 03:42:54 +02:00
Laurent Destailleur
d9aa83e699 Fix phpcs 2020-10-23 03:41:26 +02:00
Laurent Destailleur
e811a9b13e
Merge pull request #15097 from marc-dll/FIX_10.0_supplier_invoice_echeance 
FIX: supplier invoice: automatically calculate payment term when modifying payment condition
 2020-10-22 18:40:07 +02:00
Laurent Destailleur
b4581b6af8
Better error management 2020-10-22 18:39:45 +02:00
Marc de Lima Lucio
594d9e321e FIX: invoice payment terms edition: error management 2020-10-22 18:28:27 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
a826e328c1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:40 +02:00
Laurent Destailleur
31f1ab73b1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:29 +02:00
Laurent Destailleur
3369379ba1
Update card.php 2020-10-22 16:34:23 +02:00
Marc de Lima Lucio
34dd486b6c FIX: virtual products: displayed value is by unit 2020-10-22 16:18:37 +02:00
Laurent Destailleur
0f435f9901
Merge pull request #15098 from atm-gauthier/9.0_fix_worklow_order_auto_validated_with_shipping_validate_must_no_consider_services 
FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider serv…
 2020-10-22 16:18:11 +02:00
Laurent Destailleur
a9117fe864
Update interface_20_modWorkflow_WorkflowManager.class.php 2020-10-22 16:18:00 +02:00
Marc de Lima Lucio
1795ec6a9d FIX: supplier invoice: autoatically calculate payment term when modifying payment condition 2020-10-22 16:11:12 +02:00
Got2be
c2ad40043f FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty 2020-10-22 16:10:47 +02:00
Marc de Lima Lucio
a232a19e7d FIX: virtual products: supplier discount was not applied in component list 2020-10-22 15:16:33 +02:00
Florian Mortgat
529dfb8dfb FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched 2020-10-20 16:37:15 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Laurent Destailleur
fb3d18f962
Merge pull request #14658 from OPEN-DSI/v10-fix-extrafields-sellist-linked-options-load 
FIX load default linked options for linked sellist extra fields
 2020-10-17 18:13:13 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Laurent Destailleur
a9a519e890
Merge pull request #15025 from fmarcet/10.0 
FIX: Unable to edit extrafields in expense report
 2020-10-15 20:30:14 +02:00
Laurent Destailleur
4eddcb7503
Merge pull request #15023 from Ahuahuachi/10.0 
FIX #14927 Change ContratLigne property type to product_type
 2020-10-15 20:29:38 +02:00
Laurent Destailleur
3d68ab4059
Update box_services_contracts.php 2020-10-15 20:28:27 +02:00
Laurent Destailleur
75290d1bd4
Update contrat.class.php 2020-10-15 20:26:12 +02:00
Laurent Destailleur
c3a02d0391
Update contrat.class.php 2020-10-15 20:24:26 +02:00
Ferran Marcet
32d823c739 FIX: Unable to edit extrafields in expense report 2020-10-15 09:40:50 +02:00
ATM john
b9cbd84d4e Fix page break 2020-10-15 09:30:48 +02:00
Alfredo Altamirano
4a3ffbb6d4 FIX #14927 Change ContratLigne property type to product_type 
This bug is produced because the ContratLigne class gives a property type instead of a product_type
 2020-10-14 22:17:50 -05:00
Laurent Destailleur
1691fcedfb Fix phpcs 2020-10-14 20:13:30 +02:00
Laurent Destailleur
f1f1f2b9c8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:34 +02:00
Laurent Destailleur
496d429dcd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:25 +02:00
atm-lena
bf7d5b56fb FIX subcat filter 2020-10-12 11:50:19 +02:00
Alexandre SPANGARO
231a866838 FIX Loan - Return on list when you cancel create form or delete a loan 2020-10-10 07:38:29 +02:00
atm-lena
74ae9a2618 FIX CA report by product/service : subcategory filter 2020-10-08 10:49:46 +02:00
Laurent Destailleur
84105e996a Fix for #14940 2020-10-07 01:03:48 +02:00
Laurent Destailleur
989074f13a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-06 13:13:31 +02:00
lvessiller
496150d747 FIX extrafield required error after submit 2020-10-06 10:21:24 +02:00