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

60274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e1d9dfc862 Complete example of template 2017-07-11 15:12:01 +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
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
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
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
BENKE Charlene
1ab3e0c3fa if no suppliers selected, no subprice yet 2017-07-10 14:00:32 +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 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
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
fappels
13d6664ab4 Fix delete product from product card 2017-07-09 12:47:51 +02:00
Laurent Destailleur
b61f7c0179 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-08 22:17:29 +02:00
Laurent Destailleur
65ea0fc2b4 FIX value of user id filled to 0 in llx_bank_url when recording an 
expense report.
 2017-07-08 22:16:35 +02:00
Laurent Destailleur
9d0cb07ff9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/expensereport/payment/payment.php
 2017-07-08 21:54:37 +02:00
Laurent Destailleur
7b6e60077a FIX id of user not saved when making a payment of expense report 2017-07-08 21:53:28 +02:00
Laurent Destailleur
45d8fbb19e Fix gravatar 2017-07-08 21:39:48 +02:00
Laurent Destailleur
d223283359 Fix phpcs 2017-07-08 20:59:53 +02:00
Laurent Destailleur
a562e5a919 Maxi debug of accountancy ledger page. 2017-07-08 20:52:53 +02:00
Laurent Destailleur
8a9c38114f Fix bug reported by scrutinizer 2017-07-08 19:05:51 +02:00
Laurent Destailleur
00e1fab1af Fix bad var 2017-07-08 19:01:09 +02:00
Laurent Destailleur
f32b27e8bd Better management of vat with code 2017-07-08 18:50:58 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
4290be7ee6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-08 18:10:02 +02:00
Laurent Destailleur
ba3b6b6aa5 Better support of vat with code in expense report 2017-07-08 18:09:45 +02:00
Laurent Destailleur
cf6745b1ae Debug module builder 2017-07-08 17:08:07 +02:00
Laurent Destailleur
8db4e91888 Debug modulebuilder 2017-07-08 15:43:36 +02:00
Laurent Destailleur
4f75b6d656 Fix phpcs 2017-07-08 14:58:19 +02:00
Laurent Destailleur
9f486716c1 Fix phpcs 2017-07-08 14:56:43 +02:00
Laurent Destailleur
49689fc56f Fix bad extension 2017-07-08 14:30:16 +02:00
Laurent Destailleur
2ea7f38d38 Fix migration of version that is not a final version 2017-07-08 12:48:17 +02:00
Laurent Destailleur
a9468ad84a Look and feel v6 2017-07-08 00:42:55 +02:00
Laurent Destailleur
e1ba69eee0 Fix edit of automatic event should keep its type. 2017-07-08 00:19:30 +02:00
Laurent Destailleur
fbca244212 Fix must go back to next version 2017-07-07 23:19:15 +02:00
Laurent Destailleur
eff4282cc2 Clean files 2017-07-07 22:19:01 +02:00
Laurent Destailleur
5ad6d70397 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 22:05:01 +02:00
Laurent Destailleur
4bae65bedc Fix travis 2017-07-07 22:04:29 +02:00
Laurent Destailleur
efd292e8f5 Merge pull request #7126 from atm-gauthier/FIX_add_contact 
FIX : we have to check if contact doesn't already exist on add_contact
 2017-07-07 20:33:24 +02:00
Laurent Destailleur
1d35c87c18 Merge pull request #7125 from aspangaro/6.0-fec3 
Fix some problems
 2017-07-07 20:32:27 +02:00
Laurent Destailleur
34d0c79e32 Merge pull request #7124 from fappels/develop_updateline_notriggerflag 
New add trigger disable to updateline functions
 2017-07-07 20:30:04 +02:00
Laurent Destailleur
02aa4f7e0c Fix permission to show details of project 2017-07-07 20:28:43 +02:00
Laurent Destailleur
749e5eb7f4 Fix link 2017-07-07 20:24:39 +02:00