Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-10 09:52:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 39 Branches 191 Tags
9165ea9e673a0e4f743d43a627cda170ce5547eb
Commit Graph

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe Grand
e4faa0228e Update pdf_strato.modules.php 2020-08-04 15:40:42 +02:00
Laurent Destailleur
20a11b0f46 Doc 2020-08-04 15:36:35 +02:00
Laurent Destailleur
68fa8fdcaa Doc 2020-08-04 15:18:24 +02:00
Laurent Destailleur
cb0a9868d7 Space 2020-08-04 15:16:11 +02:00
Laurent Destailleur
07f420d58e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
 2020-08-04 15:03:51 +02:00
Laurent Destailleur
5d20f47473 FIX page for confirmation of payments is empty 2020-08-04 15:00:03 +02:00
Laurent Destailleur
e16fd45972 FIX Label of opportunities in graph with special chars badly encoded 2020-08-04 14:44:52 +02:00
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
9a5d0ab0a2 FIX #14236 2020-08-04 13:48:11 +02:00
Laurent Destailleur
30560397e4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-08-04 13:43:00 +02:00
Laurent Destailleur
241a97fd19 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-04 13:41:26 +02:00
Laurent Destailleur
83a9be2428 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-08-04 13:41:19 +02:00
Laurent Destailleur
3c85d27e1f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-04 13:32:36 +02:00
Laurent Destailleur
39a5583930 FIX #14146 2020-08-04 13:32:26 +02:00
Laurent Destailleur
4587031481 FIX #14336 2020-08-04 13:31:29 +02:00
Laurent Destailleur
bd8e8a4087 Merge pull request #14351 from atm-quentin/FIX_product_label_desc_update 
FIX product label and desc were never updated when modifying trans
 2020-08-04 13:07:41 +02:00
Laurent Destailleur
b0cafd47a0 Merge pull request #14354 from atm-quentin/FIX_test_libelle_pdf 
fix check also field "libelle"
 2020-08-04 12:57:44 +02:00
Laurent Destailleur
f11accf4c2 Merge pull request #14359 from atm-quentin/FIX_missing_conf_on_supplier_order 
FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order
 2020-08-04 12:48:39 +02:00
Laurent Destailleur
085fe5f7ba Merge pull request #14361 from atm-gauthier/11.0_substitution 
FIX : wrong element var for fetch_name_optionals_label function with expeditions
 2020-08-04 12:47:33 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Laurent Destailleur
c09827248b Merge pull request #14360 from ATM-Consulting/FIX_12.0_dol_string_onlythesehtmltags_remove_class_by_default 
FIX 12.0 - dol_string_onlythesehtmltags(): remove class attribute by default
 2020-08-04 12:27:31 +02:00
Laurent Destailleur
08167b959c Update actions_addupdatedelete.inc.php 2020-08-04 12:21:38 +02:00
Laurent Destailleur
2aaae47aef Update actions_addupdatedelete.inc.php 2020-08-04 12:21:32 +02:00
bahfir abbes
13202dfc7c fix:value of checked option must be the same as in showInputfield function 2020-08-04 12:21:25 +02:00
Laurent Destailleur
2fd59fd0c9 Merge pull request #14362 from bafbes/abb120129 
fix:value of checked option must be the same as in showInputfield function
 2020-08-04 12:20:38 +02:00
Laurent Destailleur
0d17682773 Update actions_addupdatedelete.inc.php 2020-08-04 12:20:10 +02:00
Laurent Destailleur
fa96fd8a8b Update actions_addupdatedelete.inc.php 2020-08-04 12:19:44 +02:00
Laurent Destailleur
cc88fe9b68 Merge pull request #14365 from bafbes/abb120131 
NEW Add link to reset qty on supplier dispatch page
 2020-08-04 12:00:47 +02:00
Laurent Destailleur
4bacb7d48e Update dispatch.php 2020-08-04 12:00:24 +02:00
Laurent Destailleur
fd551261bb Update dispatch.php 2020-08-04 11:58:29 +02:00
Laurent Destailleur
dbb2e8b1ba Update dispatch.php 2020-08-04 11:56:01 +02:00
Laurent Destailleur
615995476b Merge pull request #14367 from andreubisquerra/master 
Improve TakePOS search on click ENTER
 2020-08-04 11:52:36 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6 Merge pull request #14369 from Tim-Otte/fix-product-unit-translation 
Fixed translation of product units in documents
 2020-08-04 11:50:50 +02:00
Laurent Destailleur
96581ef1f4 Merge pull request #14370 from fappels/12_fix_search_stock_list 
FIX search warehouse list
 2020-08-04 11:49:20 +02:00
Francis Appels
81467e1d09 FIX search warehouse list 2020-08-04 11:05:12 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
andreubisquerra
0347f2a46b More elegant 2020-08-04 08:19:27 +02:00
jove@bisquerra.com
6d957c276c Improving TakePOS search informing the user if there is no record or clearing the box if it exists avoiding manually clear every scan 2020-08-04 08:11:44 +02:00
Laurent Destailleur
bf1f295602 NEW Can disable, from edit page, the whole web site 
FIX position of a cloned website
 2020-08-04 02:50:56 +02:00
Laurent Destailleur
063b63d348 Fix phpcs 2020-08-04 00:36:45 +02:00
Bahfir Abbes
8dd54e24e7 empty is more useful than 0 2020-08-03 20:42:25 +01:00
bahfir abbes
4900e85fa8 fix: reset link on supplier dispatch 2020-08-03 20:31:55 +01:00
Laurent Destailleur
da76775fbd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/factures.php
	htdocs/compta/prelevement/fiche-rejet.php
 2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a FIX Debug module direct debit order. Solve conflict with credit transfer 2020-08-03 20:16:33 +02:00
bahfir abbes
e24027fb1e fix: restore autofill lost functionality 2020-08-03 18:44:36 +01:00
Laurent Destailleur
22f69f0da9 CSS 2020-08-03 17:39:18 +02:00
Laurent Destailleur
c78b19b3b8 Move module as experimental (it is working enough). 2020-08-03 16:39:52 +02:00
Laurent Destailleur
d5237e6fda css 2020-08-03 16:36:31 +02:00