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

64295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
9430952561 Fix: missing entity filter (multicompany) 2017-07-12 11:00:18 +02:00
Laurent Destailleur
11cc1f04c4 Work on modulebuilder 2017-07-12 01:55:07 +02:00
Laurent Destailleur
b016b1ca5f Fix typo 2017-07-11 23:19:47 +02:00
Alexis Algoud
f1d451eb12 FIX empty thirdparty getNomUrl() call without thirdparty 2017-07-11 23:06:33 +02:00
Regis Houssin
f745c87394 Fix: error during upgrade process 2017-07-11 21:27:51 +02:00
Laurent Destailleur
ceeb9d7f1b Debug modulebuilder 2017-07-11 20:47:49 +02:00
Regis Houssin
cb6b81d897 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-11 19:10:22 +02:00
Regis Houssin
be837a22da Fix: error during upgrade process 2017-07-11 18:43:36 +02:00
florian HENRY
017b654acd FIX PgSQL 2017-07-11 17:45:16 +02:00
Laurent Destailleur
cbde99b419 More complete exemple 2017-07-11 15:50:20 +02:00
Laurent Destailleur
e1d9dfc862 Complete example of template 2017-07-11 15:12:01 +02:00
florian HENRY
c85bf18f0e Fix AdvtargetEmailing 2017-07-11 14:47:37 +02:00
Laurent Destailleur
90dcd3d30d Look and feel v6 2017-07-11 13:26:11 +02:00
Laurent Destailleur
c75db29ff2 Fix warning when module position is not correct 2017-07-11 12:54:49 +02:00
Laurent Destailleur
d34146b127 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-11 12:54:21 +02:00
Laurent Destailleur
32d5edf5b9 Fix warning when module position is not correct 2017-07-11 12:54:03 +02:00
Maxime Kohlhaas
794d638ded Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-07-11 09:37:45 +02:00
Laurent Destailleur
be09c911ce Debug module websites 2017-07-10 23:44:46 +02:00
AlainRnet
8c287c02ca Update card.php 
Limitation of the number of characters that is not limited in the third card as described here: https://www.dolibarr.fr/forum/5-bugs-sur-la-version-cvs-ou-demo/59229-taille-limitee-de-l-adesse-mail-des-contacts
 2017-07-10 21:39:25 +02:00
Laurent Destailleur
bdb12678d0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-10 21:38:57 +02:00
Laurent Destailleur
be0536f882 Merge pull request #7136 from AlainRnet/patch-6 
Update card.php
 2017-07-10 21:38:33 +02:00
Laurent Destailleur
fc76383718 Merge pull request #7134 from defrance/patch-22 
if no suppliers selected, no subprice yet
 2017-07-10 21:33:42 +02:00
Laurent Destailleur
9ec19958bf Merge pull request #7133 from fappels/6.0_fix_category_navigation 
Fix categorie navigation
 2017-07-10 21:33:02 +02:00
Laurent Destailleur
1617deeb81 Merge pull request #7132 from Gecka-Apps/5.0-fix1 
Fixes local taxes repports by rate
 2017-07-10 21:30:39 +02:00
Laurent Destailleur
715280b03a Merge pull request #7131 from atm-maxime/4.0 
Fix : script to migrate photo path
 2017-07-10 21:27:56 +02:00
Laurent Destailleur
baf6533ea4 Merge pull request #7130 from fappels/6.0_fix_delete_product 
Fix delete product from product card
 2017-07-10 21:26:12 +02:00
florian HENRY
8e3c2af7ee Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_prodlist

Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
 2017-07-10 16:16:11 +02:00
AlainRnet
7a12118ce4 Update card.php 
Limitation of the number of characters that is not limited in the third card as described here: https://www.dolibarr.fr/forum/5-bugs-sur-la-version-cvs-ou-demo/59229-taille-limitee-de-l-adesse-mail-des-contacts
 2017-07-10 15:41:26 +02:00
Andreas Pachler
0932ebd6c8 Added functionality to get order customer contact as contact_xx tags 2017-07-10 14:09:21 +02:00
BENKE Charlene
1ab3e0c3fa if no suppliers selected, no subprice yet 2017-07-10 14:00:32 +02:00
florian HENRY
262e23bc41 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_fixtransfert

Conflicts:
	htdocs/compta/bank/transfer.php
 2017-07-10 13:48:22 +02:00
fappels
f85fcbd216 Fix categorie navigation 2017-07-10 12:47:21 +02:00
Laurent Destailleur
bb2dc59c56 More complete request to clean 2017-07-10 11:29:09 +02:00
Laurent Dinclaux
64a5be3e00 Fixes travis error: Arguments with default values must be at the end of the argument list 2017-07-10 14:14:21 +11:00
Laurent Dinclaux
244574f8e6 Fixes functions comments 2017-07-10 13:19:59 +11:00
Laurent Dinclaux
253f7e252d Fixes local taxes repports by rate 2017-07-10 13:15:14 +11:00
Laurent Destailleur
fd89535037 Debug module website 2017-07-09 22:30:19 +02:00
Laurent Destailleur
a92effa622 Fix clean test 2017-07-09 21:16:09 +02:00
Laurent Destailleur
3c576dcf21 Fix bad name of tables 2017-07-09 20:57:45 +02:00
Laurent Destailleur
10cb7b2524 Fix remove warnings 2017-07-09 20:31:27 +02:00
Laurent Destailleur
6b4cecd0a8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-09 19:43:21 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
aa66676b7d Quick hack to solve missing alias name on doc. 2017-07-09 15:15:23 +02:00
Laurent Destailleur
9fc17d8988 Translation 2017-07-09 13:43:23 +02:00
Maxime Kohlhaas
f166c96ed5 Fix : script to migrate photo path 2017-07-09 13:09:17 +02:00
fappels
13d6664ab4 Fix delete product from product card 2017-07-09 12:47:51 +02:00
Maxime Kohlhaas
ba283377b9 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-07-09 10:13:02 +02:00
fappels
71fd9d324c Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-07-09 08:19:45 +02:00
Laurent Destailleur
eec10660ab Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-08 22:19:33 +02:00
Laurent Destailleur
4d560a8e03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-08 22:18:12 +02:00