Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

8219 Commits

Author SHA1 Message Date
Laurent Destailleur
ab19bb2455 FIX default value of selectMasssAction broken 2020-03-26 01:25:05 +01:00
Laurent Destailleur
90e0ead953 FIX default value of selectMasssAction broken 2020-03-26 00:52:05 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
 2020-03-26 00:14:06 +01:00
andreubisquerra
eef3a1795e Update dolreceiptprinter.class.php with CUPS 2020-03-25 21:30:33 +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
7c819a96d5 Merge pull request #13415 from ptibogxiv/patch-314 
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
 2020-03-25 18:32:57 +01:00
Laurent Destailleur
0a92dcc5e6 Merge pull request #13413 from atm-florian/develop 
fix extrafield creation with empty printable
 2020-03-25 18:31:28 +01:00
Laurent Destailleur
925554d15e More accurate result 2020-03-25 18:27:53 +01:00
Laurent Destailleur
3855ef6073 Add rounding code 'CR' (currency rate' 2020-03-25 17:41:39 +01:00
VESSILLER
c516a54f78 FIX get remain to pay with rounding decimals 2020-03-25 11:53:47 +01:00
ptibogxiv
06f53fdd69 Update html.form.class.php 2020-03-24 17:32:50 +01:00
ptibogxiv
8409f3ba4e NEW PRODUCT_SHOW_ORIGIN_IN_COMBO 
for some business, products have same label so we sometimes need display origin of product for a good choice
 2020-03-24 17:28:12 +01:00
florian HENRY
21febcc8fc fix extrafeild creation 2020-03-24 16:09:18 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
94b6fbb223 FIX #13300 2020-03-22 20:52:00 +01:00
Laurent Destailleur
26e9500c26 FIX #13300 2020-03-22 20:50:50 +01:00
Laurent Destailleur
6f3cbe69e8 Fix phpcs 2020-03-22 19:40:58 +01:00
Laurent Destailleur
700e384639 WIP Edit fields into alternate language 2020-03-22 19:11:21 +01:00
Laurent Destailleur
0574e1df9f Merge pull request #13386 from aspangaro/12.0_a24 
FIX: Load the translation file for extrafields
 2020-03-20 10:05:41 +01:00
Laurent Destailleur
5ffc57f3f0 Update extrafields.class.php 2020-03-20 10:05:08 +01:00
Laurent Destailleur
03b261d54c Provide information of thirdparty, contact or project to SMS handler 2020-03-19 19:11:34 +01:00
Alexandre SPANGARO
a6227aeb6a FIX: Load the translation file for extrafields 2020-03-19 11:53:42 +01:00
Laurent Destailleur
fca6d45baa NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks 
instead.
 2020-03-19 10:15:34 +01:00
Laurent Destailleur
c94c33696a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-19 09:58:04 +01:00
Laurent Destailleur
d38c6616e6 Doc 2020-03-19 09:53:20 +01:00
Laurent Destailleur
21de447d9e Merge pull request #13349 from TobiasSekan/AddSubstitutForUserCivility 
NEW "contact_civility" for ODT templates
 2020-03-18 19:31:10 +01:00
Laurent Destailleur
2c3bd78095 Merge pull request #13353 from FHenry/dev_addHookOnSelectUserORSalesRep 
new : Add hook on select user or sales rep
 2020-03-18 18:56:56 +01:00
Laurent Destailleur
3b1c02ae46 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-18 18:51:05 +01:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
 2020-03-18 18:50:55 +01:00
Laurent Destailleur
e639e24993 Merge pull request #13352 from aspangaro/12.0_a22 
FIX Update fiscalyear.class.php to filter on entity
 2020-03-18 18:19:02 +01:00
Laurent Destailleur
94750ed350 css 2020-03-17 01:31:48 +01:00
Alexandre SPANGARO
6b168428d8 Merge remote-tracking branch 'upstream/develop' into 12.0_a22 2020-03-16 12:11:01 +01:00
florian HENRY
ef83801a53 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_addHookOnSelectUserORSalesRep 2020-03-16 11:53:49 +01:00
florian HENRY
117ff5f4eb add hook to add sql filter in where clause on select users 2020-03-16 11:49:03 +01:00
Alexandre SPANGARO
301b97f6d2 FIX Update fiscalyear.class.php to filter on entity 2020-03-16 10:05:22 +01:00
Tobias Sekan
c50f2b32d8 Add substitution for "user_civility" for ODT 2020-03-16 07:58:44 +01:00
Laurent Destailleur
22e8fdb46b Enhance #13033 2020-03-15 13:57:31 +01:00
Laurent Destailleur
37fce0d3ee Fix position on merou 
Fix preselected value on contact
 2020-03-14 14:45:37 +01:00
Laurent Destailleur
0d2d2302d5 Removed not relevant graph on stats on project 2020-03-14 03:18:49 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
Laurent Destailleur
99669583d5 Fix phpcs 2020-03-13 16:46:07 +01:00
Laurent Destailleur
d90bf25351 Fix phpcs 2020-03-13 13:11:04 +01:00
Laurent Destailleur
893ae21d3a Fix phpcs 2020-03-13 11:29:27 +01:00
Laurent Destailleur
6dda972ff5 Doxygen 2020-03-13 04:12:42 +01:00
Laurent Destailleur
94589158c0 Move class from external project as internal class (project is dead) 2020-03-13 02:32:33 +01:00
Laurent Destailleur
967d4223c6 FIX #13277 2020-03-12 16:15:48 +01:00
simicar29
4f4b778c8c update_price: add invoice_supplier element name 
'invoice_supplier' as an element name was missing in test conditions to skip the update_price function
 2020-03-12 12:53:17 +01:00
stickler-ci
aaf1081f17 Fixing style errors. 2020-03-12 11:46:41 +00:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
c1e5178eeb Doc 2020-03-12 12:01:40 +01:00