Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

6147 Commits

Author SHA1 Message Date
Philippe GRAND
76a4792cd2 Merge remote-tracking branch 'upstream/develop' into new_branch_18_03_2019 2019-03-18 12:11:57 +01:00
Laurent Destailleur
de554750e4 Merge pull request #10802 from altatof/propindex 
Harmonize propal index pages
 2019-03-18 10:56:10 +01:00
Laurent Destailleur
22d61cd44d Update index.php 2019-03-18 10:55:44 +01:00
Laurent Destailleur
7adba419fc Update index.php 2019-03-18 10:54:45 +01:00
Laurent Destailleur
d8c1a50291 Update index.php 2019-03-18 10:53:58 +01:00
Philippe GRAND
198cf4af2f add comments 2019-03-18 10:06:22 +01:00
Laurent Destailleur
7cdfff7263 Fix syntax error 2019-03-15 20:42:49 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
0afbd70c2c Merge pull request #10833 from grandoc/new_branch_14_03_2019 
update with html5 compliant code
 2019-03-14 18:04:06 +01:00
Laurent Destailleur
d4f2a16abf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
 2019-03-14 17:10:58 +01:00
Laurent Destailleur
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +01:00
John BOTELLA
31e588dbab fix hookmanager global 2019-03-14 16:13:32 +01:00
John BOTELLA
8bc795c055 Fix missing hook for export agenda 2019-03-14 15:19:38 +01:00
Philippe GRAND
43b827aae7 update with html5 compliant code 2019-03-14 14:07:26 +01:00
Laurent Destailleur
e7cd8d690c Remove warnings 2019-03-13 19:06:45 +01:00
Laurent Destailleur
eeafc3c630 Standardize translation of amount 2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Joan Louis
17647de4cc Fix extrafields calls from cards for Dolibarr 8 See #10803 2019-03-12 11:24:54 +01:00
Christophe Battarel
2726cc335d replace align by css align 2019-03-12 10:24:11 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
Laurent Destailleur
e913f1919f Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards 
Update call to extrafields from cards
 2019-03-11 21:14:53 +01:00
Laurent Destailleur
abdc2aa21a Fix phpcs 2019-03-11 21:03:23 +01:00
Laurent Destailleur
3559d600e2 Merge pull request #10770 from atm-john/theme_badge_status 
Add badge status css part1
 2019-03-11 20:49:31 +01:00
Laurent Destailleur
052d29d946 Fix phpcs 2019-03-11 20:45:28 +01:00
Laurent Destailleur
6daa262779 Files for variables of themes were renamed from graph-color.php into 
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
 2019-03-11 20:32:25 +01:00
John BOTELLA
57c6c60118 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-11 14:44:35 +01:00
Joan Louis
ee5753819e Update call to extrafields from cards 2019-03-11 14:22:04 +01:00
Christophe Battarel
be612a1f6e harmonize propal index pages 2019-03-11 12:58:03 +01:00
John BOTELLA
97544e0aea add new dolGetStatus to LibStatut in common invoice class 2019-03-07 15:24:11 +01:00
Laurent Destailleur
a40a08bada Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid 
Fix default contact id for update and clone actions in event card
 2019-03-07 13:12:22 +01:00
John BOTELLA
5ea5d51247 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 09:41:03 +01:00
Lionel VESSILLER
b56cd11f02 Fix default contact id for update and clone actions in event card 2019-03-06 12:00:55 +01:00
Frédéric FRANCE
2745f98644 PSR2.Classes.PropertyDeclaration.VarUsed 2019-03-05 22:10:46 +01:00
Frédéric FRANCE
0c2a77cb53 Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:14:15 +01:00
John BOTELLA
72d96d2ac3 prepare badges 2019-03-05 17:13:20 +01:00
Laurent Destailleur
b851911708 Dolibarize module ticket 2019-03-05 12:18:46 +01:00
Frédéric FRANCE
f283782445 change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
66d8b8e7a1 Fix phpcs 2019-03-02 21:04:44 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
 2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/modAgenda.class.php
 2019-03-02 19:07:14 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
014f69850e add visibility 2019-03-01 23:08:57 +01:00
Laurent Destailleur
855aaaffd8 Better fix for type of discount 2019-02-28 11:44:10 +01:00
florian HENRY
4ebf4780c2 fix relative discount for prospect and supplier 2019-02-28 09:09:06 +01:00
Frédéric FRANCE
9b165f6b3f add visibility 2019-02-27 20:45:07 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Frédéric FRANCE
894123fb06 PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Regis Houssin
36a7303049 FIX No space found after comma in function call 2019-02-19 10:28:17 +01:00