Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

5970 Commits

Author SHA1 Message Date
Laurent Destailleur
750182f9cd Removed deprecated method actioncomm->add(), use create() instead 2019-09-04 13:54:36 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00
Laurent Destailleur
c32100c714 Merge pull request #11768 from atm-florian/10_fixeventlist 
fix event list with description
 2019-09-03 15:02:22 +02:00
Laurent Destailleur
52a543953c Fix position of tests 2019-09-03 14:58:54 +02:00
Laurent Destailleur
17ccb8fa10 Fix missing tooltip 2019-09-03 14:56:13 +02:00
Laurent Destailleur
a95e02e3f6 FIX #11789 FIX #11790 2019-09-03 14:52:03 +02:00
Laurent Destailleur
98459363df Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
6c96478040 Removed deprecated code 2019-09-02 22:57:55 +02:00
Laurent Destailleur
f54d4e3fc2 Replace deprecated code with new one 2019-08-31 02:34:54 +02:00
Laurent Destailleur
4a76dfa6ff Fix link to setup 2019-08-30 18:23:43 +02:00
Jean Traullé
c32c7d48ba Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4 The deprecated method get_OutstandingBill has been removed. You can use 
getOutstandingBills() instead.
 2019-08-29 00:45:02 +02:00
Laurent Destailleur
cb8bee7899 Responsive 2019-08-28 19:48:20 +02:00
Laurent Destailleur
9fd4f839ec Use css "pictomodule" for picto of modules 2019-08-28 19:28:50 +02:00
Laurent Destailleur
931586269a Fix td 2019-08-28 18:23:41 +02:00
Laurent Destailleur
042e9df720 Sort 2019-08-28 18:20:19 +02:00
Laurent Destailleur
d668b79738 NEW Add column tms into the table of targets for emailing 2019-08-28 18:14:46 +02:00
florian HENRY
243fca9a1a fix event list with description 2019-08-27 16:12:07 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
 2019-08-19 00:02:26 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96 Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
b1be6bf4f2 FIX #11422 Can't edit his own events with standard rights 2019-08-18 01:24:54 +02:00
Laurent Destailleur
8874a0f3c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 2019-08-15 23:39:02 +02:00
Laurent Destailleur
6430c74793 Merge pull request #11168 from hregis/develop_menu 
NEW add new function "setEntity()" and better compatibility with Multicompany
 2019-08-15 21:00:05 +02:00
Laurent Destailleur
f26a13ff13 NEW Removed deprecated code that create linked object from ->origin 2019-08-15 19:50:18 +02:00
Laurent Destailleur
ac8bf7b066 Update propal.class.php 2019-08-15 19:48:29 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
Juanjo Menent
7dab396d08 Fix: error creating a budget from an intervention 2019-08-12 17:29:25 +02:00
Laurent Destailleur
63efe82ff3 Merge pull request #11639 from ptibogxiv/patch-213 
NEW list by date_cloture on propal list
 2019-08-10 01:07:07 +02:00
Laurent Destailleur
14fabeb377 Variable rangtouse -> ranktouse 2019-08-10 00:46:20 +02:00
ptibogxiv
4de68397ae NEW list by date_cloture on propal list 2019-08-05 21:03:48 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
d0de3ef08d Merge pull request #11603 from bafbes/abb100067 
Fix:syntax error in sql query
 2019-08-01 16:06:01 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Abbes Bahfir
bf2d052d62 Fix:syntax error in sql query 2019-07-31 17:48:17 +01:00
Regis Houssin
d9ea61e47c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop_menu

Conflicts:
	htdocs/commande/class/commande.class.php
 2019-07-31 12:49:56 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
2867e31a63 Fix CSS 2019-07-27 01:13:39 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
f39f710fd9 Merge pull request #11538 from atm-maxime/fix_agenda_list_filter 
Fix lost filter in action list
 2019-07-22 18:44:22 +02:00