2
0
forked from Wavyzz/dolibarr
Commit Graph

5726 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
Laurent Destailleur
75b875ae55 Fix origin currency not visible in absolute discount view 2019-02-18 17:38:15 +01:00
Laurent Destailleur
7a79637b88 Merge pull request #10616 from frederic34/patch-27
Update pertype.php
2019-02-15 15:31:03 +01:00
Frédéric FRANCE
c7cec4be34 Update peruser.php 2019-02-14 21:45:40 +01:00
Frédéric FRANCE
b65532c5d8 Update pertype.php 2019-02-14 21:43:46 +01:00
Frédéric FRANCE
7886b5900c Update card.php 2019-02-14 20:40:03 +01:00
Laurent Destailleur
a7af1b1765 Remove deprecated code 2019-02-14 16:29:13 +01:00
ptibogxiv
1771ea8eaa Update api_proposals.class.php 2019-02-14 00:27:53 +01:00
ptibogxiv
56a0a20bb3 Fix delete contact 2019-02-14 00:27:29 +01:00
Laurent Destailleur
b9467c10bf Merge pull request #10561 from eoxia-jimmy/develop
NEW: API Proposal, Orders, Invoices: Add contact details
2019-02-13 16:39:57 +01:00
Laurent Destailleur
c2ab85aaf8 Update api_proposals.class.php 2019-02-13 16:39:17 +01:00
Frédéric FRANCE
95212e9cc1 Update ical.class.php 2019-02-13 00:44:34 +01:00
Frédéric FRANCE
3de192364b Update ical.class.php 2019-02-13 00:12:20 +01:00
Jimmy L
a172ea00a4 Rest API: Proposal, Orders, Invoices: Add contact details 2019-02-12 17:54:59 +01:00
Laurent Destailleur
e054b080a5 Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
0e42e8824b Merge branch 'develop' into new_branch_04_02_2019 2019-02-08 09:42:18 +01:00
Laurent Destailleur
af92303319 Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Laurent Destailleur
88fb491441 Fix note output 2019-02-06 00:40:07 +01:00
Laurent Destailleur
58e6cfd635 Fix popup content 2019-02-06 00:36:11 +01:00