Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 09:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

72480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
03fcc2f088 Update paymentvarious.class.php 2018-10-09 20:31:14 +02:00
Frédéric FRANCE
b917fd0cf2 do not trim int 2018-10-09 19:41:53 +02:00
Frédéric FRANCE
c3f07dd2e0 define $code for all execution paths 2018-10-09 19:28:52 +02:00
Abbes Bahfir
8160dcec6a Fix: Undeclared global variable 2018-10-09 16:10:49 +01:00
Laurent Destailleur
9fe3e7b6c0 Fix phpunit 2018-10-09 17:09:33 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df Merge 2018-10-09 17:06:08 +02:00
Laurent Destailleur
84605bc59b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-09 16:59:47 +02:00
Laurent Destailleur
dc498173c8 Code comment 2018-10-09 16:58:55 +02:00
Laurent Destailleur
430f833222 Merge pull request #9626 from OPEN-DSI/fix_product_margin 
FIX Product margin tab and credit note
 2018-10-09 16:57:08 +02:00
Laurent Destailleur
c401739fed Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 16:28:03 +02:00
Laurent Destailleur
b1c9d5e4d3 Merge 2018-10-09 16:27:30 +02:00
Laurent Destailleur
b4b82ce3d6 Drop both contraint and index 2018-10-09 16:25:57 +02:00
Laurent Destailleur
5af4b82503 Merge pull request #9250 from bugness-chl/8.0 
Revert "FIX missing drop old postgresql unique key"
 2018-10-09 16:25:39 +02:00
Laurent Destailleur
62319018dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 16:19:56 +02:00
Laurent Destailleur
bd8cf3d81e Merge pull request #9704 from atm-gauthier/7.0_fix_userlist 
FIX : when we're just admin and not super admin, if we create new use…
 2018-10-09 16:17:49 +02:00
Laurent Destailleur
bde5ee1232 Merge pull request #9621 from ptibogxiv/patch-69 
Prepare for more stripe function
 2018-10-09 16:15:23 +02:00
Laurent Destailleur
b68f6c0fca Use more generic name 2018-10-09 16:15:12 +02:00
Laurent Destailleur
422af361b4 Merge pull request #9622 from ptibogxiv/patch-68 
Prepare for more stripe function
 2018-10-09 16:14:35 +02:00
Laurent Destailleur
65b48b06d9 Update llx_paiement.sql 2018-10-09 16:14:28 +02:00
Laurent Destailleur
4fc1f3be4a Merge pull request #9716 from grandoc/new_branch_09_10_2018 
Standardize and update code
 2018-10-09 16:07:43 +02:00
Laurent Destailleur
69b33199da Merge pull request #9714 from homer8173/patch-3 
Fix log bookmark create
 2018-10-09 16:07:15 +02:00
Laurent Destailleur
0fbc9d640e Fix syntax error 2018-10-09 16:05:56 +02:00
Laurent Destailleur
5d2f34dc1e Merge pull request #9715 from inoveaconseil/datapolicies 
Dolibarization DataPolicies
 2018-10-09 16:03:14 +02:00
Philippe GRAND
52369bcb2b Standardize and update code 2018-10-09 15:46:10 +02:00
Philippe GRAND
9dadd5212d Merge remote-tracking branch 'upstream/develop' into new_branch_09_10_2018 2018-10-09 15:45:07 +02:00
Philippe GRAND
e9bd1be41b Standardize and update code 2018-10-09 15:38:42 +02:00
Laurent Destailleur
46ad7de5dd Merge pull request #9709 from bafbes/abb80031 
NEW Category filter on user list
 2018-10-09 15:38:00 +02:00
Laurent Destailleur
dfe9c05d2f Merge menu entry for tags/categories as submenu of element. 2018-10-09 15:26:15 +02:00
Laurent Destailleur
0938ac4afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/list.php
 2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
387d9d685a Update auguria menu 2018-10-09 14:52:53 +02:00
Laurent Destailleur
dd0cbabc91 Fix translation 2018-10-09 14:44:13 +02:00
Laurent Destailleur
9bea9edfd7 FIX Menu to show/edit Users categories was missing 2018-10-09 14:41:21 +02:00
Inovea Conseil
768ab66d1f Datapolicies 2018-10-09 14:40:15 +02:00
Laurent Destailleur
a2a53a32f1 FIX Look and feel v8. Missing button "Create category" 2018-10-09 14:34:25 +02:00
Abbes Bahfir
073914572c Fix: users categories type is Categorie::TYPE_USER 2018-10-09 14:24:41 +02:00
Laurent Destailleur
966e97617d Merge pull request #9708 from bafbes/abb80030 
FIX users categories type is Categorie::TYPE_USER
 2018-10-09 14:24:21 +02:00
Laurent Destailleur
f365a987c4 FIX restore last seach criteria 
FIX filter on employee
 2018-10-09 14:20:53 +02:00
Abbes Bahfir
603c70ffc7 Fix: Searching on employee field disables employee mode 2018-10-09 14:10:04 +02:00
Laurent Destailleur
362c226ad6 Merge pull request #9710 from bafbes/abb80032 
Fix: Searching on employee field disables employee mode
 2018-10-09 14:09:23 +02:00
Laurent Destailleur
f3647c45e6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-09 14:06:56 +02:00
Laurent Destailleur
4d959bbea7 Fix consistency of label of proposal status 2018-10-09 14:06:45 +02:00
Laurent Destailleur
94743d50be Merge pull request #9707 from aspangaro/9.0_FEC 
NEW Add FEC Export in accountancy
 2018-10-09 13:05:20 +02:00
Norbert Penel
aa4f57e888 Fix log bookmark create 
bad log message
 2018-10-09 12:53:45 +02:00
Laurent Destailleur
6a1610cdef Merge pull request #9705 from ebzao/patch-1 
fix bank ref override "bordereau cheque" ref
 2018-10-09 12:44:18 +02:00
Laurent Destailleur
bc4ddce314 Merge pull request #9713 from frederic34/patch-9 
Update index.php
 2018-10-09 12:43:32 +02:00
Laurent Destailleur
67e7736eb2 Merge pull request #9698 from Dolibarr/atm-maxime-patch-1 
Fix request on project overview
 2018-10-09 12:40:51 +02:00
Laurent Destailleur
398603c789 Merge pull request #9696 from IAS-SYSTEMS-CSC/develop 
new malay lang tag
 2018-10-09 12:40:26 +02:00
Laurent Destailleur
1297f25468 Merge pull request #9690 from grandoc/new_branch_05_10_2018 
clean code
 2018-10-09 12:40:03 +02:00