Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,561 Commits 36 Branches 189 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

11075 Commits

Author SHA1 Message Date
lmarcouiller
40b20d510d fix to fix PR 2021-02-11 10:05:40 +01:00
lmarcouiller
484b406985 Add website url form 2021-02-10 10:41:13 +01:00
lmarcouiller
1ae3b151c8 Add new button to generate sitemap 2021-02-10 09:11:53 +01:00
Laurent Destailleur
d80f23589d Fix missing entry 2021-02-10 02:39:58 +01:00
Laurent Destailleur
1c99eaedbc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:00:11 +01:00
Laurent Destailleur
4a97690f78 Add a check on syntax of hostname for email colector 2021-02-09 13:59:00 +01:00
Laurent Destailleur
3d892bd60b Merge pull request #15735 from FHenry/dev_new_project_task_add_contact 
NEW: When add contact/user to Project, ask to also affect on Tasks
 2021-02-09 13:43:08 +01:00
Gauthier PC portable 024
d106fe7e90 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 09:50:46 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
Alexandre SPANGARO
b8ea96ba57 Fix module asset in development 2021-02-08 05:39:07 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
Laurent Destailleur
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Laurent Destailleur
9843e79bac Trans 2021-02-05 15:43:03 +01:00
Gauthier PC portable 024
d93c71a42f Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:28:15 +01:00
Gauthier PC portable 024
e6bea60409 FIX : bank_url 2021-02-05 12:27:14 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
49470ea216 Trans 2021-02-05 00:56:44 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/delais.php
 2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired 
FIX Bad dates on info tabs
 2021-02-04 11:56:53 +01:00
Laurent Destailleur
369a835abb Merge pull request #16151 from bb2a/mass_action_propal_nosigned 
NEW: add massActions to set a commercial proposal to status "Refused"
 2021-02-03 20:36:10 +01:00
Anthony Berton
eb15c4d800 20200203 2021-02-03 11:29:54 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
f4f9a7c461 Clean page of info tools 2021-02-02 09:44:51 +01:00
Gauthier PC portable 024
1eb4968a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 12:00:04 +01:00
Laurent Destailleur
b349290cd1 Fix test for date in future 2021-01-31 12:57:54 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
215e36bb2e Fix typo 2021-01-29 11:19:33 +01:00
Laurent Destailleur
ce3279c462 NEW Add function showValueWithCopyAndPasteButton() to add a copy/paste 
button on a text.
 2021-01-28 12:34:54 +01:00
Laurent Destailleur
4fbf2fff6f Merge pull request #16034 from Hystepik/develop#2 
Close #16027 New Feature copy Code Client
 2021-01-28 11:17:10 +01:00
Gauthier PC portable 024
8a5588e518 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-28 10:28:36 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Frédéric FRANCE
7cd698aff9 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-26 20:19:49 +01:00
Laurent Destailleur
19dd36aa59 Trans 2021-01-26 11:45:29 +01:00
Laurent Destailleur
6313fb8be0 Fix lang 2021-01-26 11:38:07 +01:00
Laurent Destailleur
c417f730b9 Clean language file 2021-01-26 11:31:48 +01:00
Alexandre SPANGARO
94d4f2da8e Missing language key & error translation 2021-01-26 05:14:01 +01:00
Laurent Destailleur
b4be97ec15 Draft code 2021-01-25 18:59:04 +01:00
Laurent Destailleur
21dccadb3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:32:39 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
7365974594 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:24:56 +01:00
Laurent Destailleur
b4783f69d6 Show if permission is an advanced permission 2021-01-23 18:13:50 +01:00
Laurent Destailleur
f7e637a552 Trans 2021-01-23 17:40:14 +01:00
Laurent Destailleur
2acf2353a3 Fix bad link 2021-01-23 12:16:25 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00