Laurent Destailleur
|
99809b487e
|
Standardize code
|
2020-08-16 23:33:50 +02:00 |
|
Frédéric FRANCE
|
5aa84c64d0
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:54:33 +02:00 |
|
stickler-ci
|
74662d3ecd
|
Fixing style errors.
|
2020-05-23 08:18:41 +00:00 |
|
Philippe Grand
|
e7c2bd830a
|
fix merge issue
|
2020-05-23 10:17:48 +02:00 |
|
Philippe Grand
|
b137775046
|
fix merge issue
|
2020-05-23 10:12:14 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Philippe GRAND
|
23282acfbc
|
update
|
2020-05-21 11:20:01 +02:00 |
|
Frédéric FRANCE
|
43dcd9beb5
|
add new rule
|
2020-05-21 00:02:33 +02:00 |
|
Laurent Destailleur
|
ebbd4413f5
|
Fix scrutinizer error
|
2020-05-13 00:47:27 +02:00 |
|
Laurent Destailleur
|
6b114a31ce
|
Look and feel v12
|
2020-04-25 03:00:41 +02:00 |
|
Laurent Destailleur
|
c9f242406c
|
Look and feel v12
|
2020-04-25 02:44:24 +02:00 |
|
Laurent Destailleur
|
b6baba7651
|
Removed deprecated var
|
2020-04-12 18:59:22 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Alexandre SPANGARO
|
191374cc8f
|
Work on reconcilation of accouting account
|
2020-03-16 08:07:05 +01:00 |
|
Alexandre SPANGARO
|
af5444806d
|
Work on reconcilation of accouting account
|
2020-03-16 06:41:14 +01:00 |
|
Alexandre SPANGARO
|
bc717bc6ae
|
Work on reconciliation of accouting account
|
2020-03-15 07:49:24 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Alexandre SPANGARO
|
99b02fca47
|
Fix error
|
2020-03-03 05:18:45 +01:00 |
|
Alexandre SPANGARO
|
278dfce301
|
Fix not logical use
|
2020-03-03 05:16:14 +01:00 |
|
Alexandre SPANGARO
|
fbd7dc66b2
|
Fix error
|
2020-03-03 05:06:31 +01:00 |
|
Alexandre SPANGARO
|
6982997de5
|
Fix error
|
2020-03-01 05:09:57 +01:00 |
|
Alexandre SPANGARO
|
d9b9913e8a
|
NEW: Accountancy - Add mode intra & export for product or service bought
|
2020-03-01 04:52:12 +01:00 |
|
Laurent Destailleur
|
f2dba4f621
|
Merge pull request #13227 from aspangaro/12.0_a16
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
|
2020-02-29 13:02:43 +01:00 |
|
Alexandre SPANGARO
|
86d9622360
|
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
|
2020-02-27 10:44:04 +01:00 |
|
Laurent Destailleur
|
1583bed0e4
|
FIX #13146 #13198
|
2020-02-26 15:41:46 +01:00 |
|
Laurent Destailleur
|
d172a95dfe
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-25 14:37:04 +01:00 |
|
Laurent Destailleur
|
2067abdc7e
|
Fix title of page
|
2020-02-24 23:10:04 +01:00 |
|
Laurent Destailleur
|
2118c2eede
|
Fix missing title line
|
2020-02-24 23:04:17 +01:00 |
|
Laurent Destailleur
|
4b4d1bcce2
|
Fix disable accountancy chart that is deprecated.
|
2020-02-24 03:05:58 +01:00 |
|
Philippe GRAND
|
95228ae01c
|
fix merging
|
2020-02-22 12:21:17 +01:00 |
|
Scrutinizer Auto-Fixer
|
fd48877dc6
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-18 22:47:25 +00:00 |
|
Laurent Destailleur
|
f4f3efec62
|
Fight against $_POST
|
2020-02-16 19:33:58 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Philippe GRAND
|
c736d9ae25
|
fix merging
|
2020-01-27 09:48:38 +01:00 |
|
Laurent Destailleur
|
d329c4ad38
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-21 22:39:30 +01:00 |
|
Laurent Destailleur
|
69fae5a679
|
Fix search on accounting account when option to padd 0 is on.
|
2020-01-21 22:38:03 +01:00 |
|
Laurent Destailleur
|
c7617279de
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-21 22:27:00 +01:00 |
|
Laurent Destailleur
|
80648db7fc
|
Fix search on accounting account when option to padd 0 is on.
|
2020-01-21 22:26:37 +01:00 |
|
Laurent Destailleur
|
ff9a2608d8
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
|
2020-01-21 22:22:16 +01:00 |
|
Laurent Destailleur
|
8f1737952d
|
Fix search on accounting account when option to padd 0 is on.
|
2020-01-21 22:20:32 +01:00 |
|
Laurent Destailleur
|
a36b0ea4f5
|
Fix filter on parent account in list of accounting accounts
|
2020-01-21 21:36:40 +01:00 |
|
Alexandre SPANGARO
|
c3518426bd
|
NEW Accountancy - Add possibility to manage an short alternative label - use to simplify
|
2020-01-03 22:05:49 +01:00 |
|
Laurent Destailleur
|
d1fdd11b37
|
Close #10907
|
2019-12-19 11:32:10 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
a3fa6eb473
|
Debug v11
|
2019-12-16 19:40:18 +01:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Laurent Destailleur
|
4f7b698e92
|
Fix filter on sell/purchase status
|
2019-11-11 19:42:54 +01:00 |
|
Laurent Destailleur
|
8976bd7c9b
|
Fix setup of accounting account
|
2019-11-11 19:05:42 +01:00 |
|
Laurent Destailleur
|
f62f73f5cb
|
FIX Bad value suggested in default product account setup
|
2019-11-11 19:05:06 +01:00 |
|
Laurent Destailleur
|
40d66489ad
|
Trans
|
2019-11-11 13:47:17 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Philippe GRAND
|
4acc107191
|
fix bad setEventMessages
|
2019-11-05 10:01:21 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
360bf55f5b
|
clean indent
|
2019-10-20 01:09:11 +02:00 |
|
Laurent Destailleur
|
87ec1de78e
|
Start to work on solution to sort permissions by module
|
2019-10-17 18:43:07 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
035da6a711
|
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
|
2019-10-07 14:24:22 +02:00 |
|
Laurent Destailleur
|
edfedbb818
|
FIX Load chart of account only if we click or select button "Load chart"
|
2019-10-06 21:13:55 +02:00 |
|
Laurent Destailleur
|
80c1a92872
|
FIX Load chart of account only if we click or select button "Load chart"
|
2019-10-06 21:11:29 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Alexandre SPANGARO
|
a6e429ff32
|
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
|
2019-10-02 08:49:00 +02:00 |
|
Alexandre SPANGARO
|
f91513937a
|
Remove option to hide FAQ
|
2019-09-30 21:37:20 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
a005408d83
|
NEW Accountancy - Add an option to hide FAQ on index and add widget in area
|
2019-09-23 20:42:50 +02:00 |
|
Laurent Destailleur
|
86d39b435b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-12 02:42:11 +02:00 |
|
Laurent Destailleur
|
e21d6289ea
|
FIX Can't add a new chart of account
|
2019-08-10 02:09:59 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
6c23154a91
|
FIX #11506
|
2019-07-15 22:59:18 +02:00 |
|
Laurent Destailleur
|
cf00ae971a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-15 22:45:29 +02:00 |
|
Laurent Destailleur
|
e396824133
|
FIX #11507
|
2019-07-15 19:08:57 +02:00 |
|
Laurent Destailleur
|
57140b79dc
|
Restore official text of licence
|
2019-06-24 18:30:07 +02:00 |
|
Philippe GRAND
|
fea969dc63
|
all http addresses should be https now
|
2019-06-23 15:39:25 +02:00 |
|
Laurent Destailleur
|
afb6362317
|
Fix look and feel v10
Fix link to direct debit payment order
|
2019-06-20 13:37:06 +02:00 |
|
Alexandre SPANGARO
|
2085958a69
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-23 11:10:07 +02:00 |
|
Laurent Destailleur
|
e463b17c15
|
Fix look and feel v10
|
2019-05-21 15:31:56 +02:00 |
|
Alexandre SPANGARO
|
d9e9cb2ea9
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-20 15:02:05 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
Alexandre SPANGARO
|
d4e2fab983
|
Replace term "Advanced accountancy" by Accountancy (Double entries)
|
2019-05-13 22:25:15 +02:00 |
|
Laurent Destailleur
|
e37519ed89
|
Fix label
|
2019-05-07 22:43:59 +02:00 |
|
Laurent Destailleur
|
60bf3452c3
|
Hide export in EEC for non european countries
|
2019-05-04 12:26:54 +02:00 |
|
Alexandre SPANGARO
|
61547e3f82
|
NEW Manage account sell_intra & sell_export in page default product
|
2019-05-03 14:08:20 +02:00 |
|
Laurent Destailleur
|
4421dedbd2
|
Merge pull request #11008 from aspangaro/10.0_closure
FIX: Update blocked by datec on fiscal year
|
2019-04-24 10:28:23 +02:00 |
|
Laurent Destailleur
|
74d0edfc59
|
Removed not used file
|
2019-04-23 13:24:32 +02:00 |
|
Laurent Destailleur
|
7c458ee4c0
|
TODO
|
2019-04-23 13:02:25 +02:00 |
|
Laurent Destailleur
|
1c90d157a0
|
Look and feel v10
|
2019-04-19 18:45:01 +02:00 |
|
Laurent Destailleur
|
94ca74b37e
|
Merge pull request #11009 from bafbes/abb90047
fix:Select chart plan from active countries only 2829bfc
|
2019-04-19 13:12:00 +02:00 |
|
Laurent Destailleur
|
6d34a38042
|
Update account.php
|
2019-04-19 13:11:50 +02:00 |
|
Laurent Destailleur
|
cb8f9cc120
|
Fix link
|
2019-04-19 12:37:55 +02:00 |
|
Laurent Destailleur
|
87eb5f5c02
|
Fix filter lost
|
2019-04-19 12:36:32 +02:00 |
|
ATM john
|
07e6ce5460
|
Appli function to links
|
2019-04-15 21:33:31 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
Abbes Bahfir
|
2829bfc84f
|
fix:Select chart plan from active countries only
|
2019-04-14 17:36:16 +01:00 |
|
Alexandre SPANGARO
|
c1ecfae6f2
|
FIX: Update on fiscal year
|
2019-04-13 22:46:40 +02:00 |
|
Laurent Destailleur
|
c62d147c60
|
Auto clean search field to avoid to have 2 conflict search criteria
|
2019-03-25 16:47:20 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Philippe GRAND
|
d118d269a2
|
update with html5 compliant code
|
2019-03-19 13:44:21 +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
|
8410d59182
|
FIX Missing field "In sale" in list
|
2019-03-14 16:16:50 +01:00 |
|
Laurent Destailleur
|
5ccfba1210
|
FIX Edit of personalized groups
Conflicts:
htdocs/accountancy/admin/categories.php
|
2019-03-14 16:06:20 +01:00 |
|
Laurent Destailleur
|
3ab5c3e6ab
|
FIX Edit of personalized groups
|
2019-03-14 16:03:37 +01:00 |
|
Frédéric FRANCE
|
a836c75d70
|
replace html by html5 in accountancy
|
2019-03-03 10:31:46 +01:00 |
|
Laurent Destailleur
|
b33b3698c8
|
Merge pull request #10691 from aspangaro/develop
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
|
2019-02-27 02:18:20 +01:00 |
|
Alexandre SPANGARO
|
1c59554806
|
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
|
2019-02-25 22:22:31 +01:00 |
|
Alexandre SPANGARO
|
49a975beb3
|
Update works
|
2019-02-18 07:14:21 +01:00 |
|
Alexandre SPANGARO
|
93a0cdd6d6
|
NEW: Add accounting account for result
Use for closure workflow
|
2019-02-18 06:00:21 +01:00 |
|
Laurent Destailleur
|
9dc2a1f148
|
Update productaccount.php
|
2019-02-12 12:51:52 +01:00 |
|
Laurent Destailleur
|
53b2100dbb
|
Update productaccount.php
|
2019-02-12 12:50:36 +01:00 |
|
klemens
|
beb2791dde
|
spelling fixes
|
2019-02-10 12:59:09 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
d0b20178e0
|
Merge pull request #10442 from aspangaro/10.0_accountancy_default
NEW: When you create product or service, sell accountancy account by default are proposed
|
2019-01-30 16:30:13 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
bdbc61c1aa
|
Merge pull request #10454 from grandoc/new_branch_30_01_2019
update with html5 compliant code
|
2019-01-30 16:01:08 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Philippe GRAND
|
cf27065ed1
|
update with html5 compliant code
|
2019-01-30 09:24:22 +01:00 |
|
Philippe GRAND
|
bb6159784a
|
update with html5 compliant code
|
2019-01-30 08:42:31 +01:00 |
|
Alexandre SPANGARO
|
64975b3b9e
|
NEW: When you create product or service, sell accountancy account by default are proposed
|
2019-01-28 22:27:55 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
ff39491f15
|
wip
|
2019-01-27 23:31:37 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Philippe GRAND
|
133e6f3de0
|
useless code
|
2019-01-25 16:27:36 +01:00 |
|
Philippe GRAND
|
0d089f2fec
|
fix : The condition == 3 is always false
|
2019-01-25 15:50:30 +01:00 |
|
Philippe GRAND
|
f045cf353b
|
update with html5 compliant code
|
2019-01-21 21:13:42 +01:00 |
|
Philippe Grand
|
dff30f17a5
|
Update productaccount.php
|
2019-01-16 19:20:28 +01:00 |
|
Philippe Grand
|
c9aa00c09f
|
Update productaccount.php
|
2019-01-16 19:19:54 +01:00 |
|
Philippe Grand
|
6d266d78b1
|
Update productaccount.php
|
2019-01-16 19:19:14 +01:00 |
|
Philippe Grand
|
27edf7c803
|
Update importaccounts.php
|
2019-01-16 19:18:36 +01:00 |
|
Philippe Grand
|
9e699b59ad
|
Update fiscalyear.php
|
2019-01-16 19:17:53 +01:00 |
|
Philippe GRAND
|
3168c76946
|
update with html5 compliant code
|
2019-01-16 17:39:40 +01:00 |
|
Alexandre SPANGARO
|
41c7af590d
|
NEW: Accountancy - Add default accounting account for member subcriptions
|
2018-12-29 22:11:24 +01:00 |
|
Laurent Destailleur
|
eb66d45947
|
Merge branch 'develop' into 10.0_accoutancy_stats
|
2018-12-15 15:17:15 +01:00 |
|
Laurent Destailleur
|
e0011222d1
|
Fix syntax error
|
2018-12-14 16:25:37 +01:00 |
|
Laurent Destailleur
|
185524bd50
|
Update fiscalyear.php
|
2018-12-14 15:49:58 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Alexandre SPANGARO
|
088c002ed1
|
NEW: Add stats on entries & movements by fiscal year
|
2018-12-02 11:01:11 +01:00 |
|
Alexandre SPANGARO
|
703d3d90eb
|
Revert "Fix create accounting account from balance"
This reverts commit 9154fd366f.
|
2018-11-24 22:40:04 +01:00 |
|
Alexandre SPANGARO
|
9154fd366f
|
Fix create accounting account from balance
|
2018-11-24 22:30:06 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +01:00 |
|
Laurent Destailleur
|
84983140b6
|
Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
|
2018-11-11 17:35:35 +01:00 |
|
Laurent Destailleur
|
ed3a333436
|
Fix phpcs
|
2018-11-10 13:11:18 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
7dd941dd51
|
Fix bad fix
|
2018-11-06 19:51:16 +01:00 |
|
Laurent Destailleur
|
4a25317f10
|
Fix security on GETPOST('action'). Param must be sanitized.
|
2018-11-05 20:29:07 +01:00 |
|
Laurent Destailleur
|
c0f4ec5a3e
|
FIX sanitize param $action
|
2018-11-05 17:53:31 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
0e464ea4f5
|
Merge pull request #9866 from frederic34/emptylines
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-26 15:31:24 +02:00 |
|
Frédéric FRANCE
|
21c441540c
|
add string cast
|
2018-10-25 21:57:19 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Philippe Grand
|
7e82e3d44c
|
Update card.php
|
2018-10-12 19:13:07 +02:00 |
|
Philippe GRAND
|
1cfb06934c
|
Standardize and update code
|
2018-10-12 16:49:53 +02:00 |
|
Philippe GRAND
|
bd426d1052
|
Standardize and update code
|
2018-10-12 16:44:25 +02:00 |
|
Philippe GRAND
|
4df574d58e
|
Standardize and update code
|
2018-10-12 16:23:27 +02:00 |
|
Philippe GRAND
|
c5edb3289b
|
Standardize and update code
|
2018-10-12 16:09:05 +02:00 |
|
Philippe GRAND
|
181c1e0b77
|
Standardize and update code
|
2018-10-12 16:01:27 +02:00 |
|
Philippe GRAND
|
9d4f6dc444
|
Standardize and update code
|
2018-10-12 15:55:36 +02:00 |
|
Laurent Destailleur
|
6c55bfc0f7
|
Fix export and remove duplicate csv export.
|
2018-10-10 19:45:26 +02:00 |
|
Laurent Destailleur
|
1f44380dd1
|
Clean code
|
2018-10-04 16:20:55 +02:00 |
|
Laurent Destailleur
|
111d589474
|
NEW Can mix offset before and after with rules for due date of invoices
|
2018-10-04 16:06:26 +02:00 |
|
Laurent Destailleur
|
e07ce644e8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
|
2018-09-18 11:49:35 +02:00 |
|
Laurent Destailleur
|
2d8eb034e3
|
FIX Maxi debug to allow to load chart of account with multicompany
|
2018-09-17 21:02:07 +02:00 |
|
Frédéric FRANCE
|
3e71f4e6b0
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 18:36:49 +02:00 |
|
Frédéric FRANCE
|
8c5a785797
|
completely comment unused code
|
2018-09-09 13:42:38 +02:00 |
|
Frédéric FRANCE
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +02:00 |
|
Frédéric FRANCE
|
cb97a29fc0
|
introduce seletDate
|
2018-09-08 12:00:11 +02:00 |
|
Frédéric FRANCE
|
7e0ef3ad7e
|
Update fiscalyear_card.php
|
2018-09-06 22:10:19 +02:00 |
|
Laurent Destailleur
|
540999faa5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
|
2018-09-03 14:06:51 +02:00 |
|
Laurent Destailleur
|
47655f0725
|
Add comment as FIXME
|
2018-09-03 14:00:12 +02:00 |
|
Laurent Destailleur
|
bcee0ef0ae
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
|
2018-09-01 14:16:57 +02:00 |
|
Frédéric FRANCE
|
2b5407c31d
|
Update export.php
|
2018-09-01 13:30:28 +02:00 |
|
Frédéric FRANCE
|
6113b536a0
|
remove superfluous spaces
|
2018-08-12 19:59:39 +02:00 |
|
Philippe GRAND
|
5a4524451c
|
standardize
|
2018-07-28 14:02:33 +02:00 |
|
Laurent Destailleur
|
5c93fa1bfb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
|
2018-06-26 01:25:03 +02:00 |
|
Laurent Destailleur
|
ca04ffe420
|
Load lang
|
2018-06-22 17:07:49 +02:00 |
|
Laurent Destailleur
|
4a5fd35e11
|
Look and feel v8
|
2018-06-13 22:57:41 +02:00 |
|
Alexandre SPANGARO
|
f2c04c5653
|
Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
|
2018-06-05 20:37:39 +02:00 |
|
Frédéric FRANCE
|
d986909109
|
loadlangs
|
2018-05-26 23:52:52 +02:00 |
|
Laurent Destailleur
|
de84f0e687
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
|
2018-05-21 23:35:09 +02:00 |
|
Laurent Destailleur
|
004c85b4ed
|
Update journals_list.php
|
2018-05-18 11:35:37 +02:00 |
|
Abbes Bahfir
|
933e277862
|
Fix: Add journal label translation in journal list
|
2018-05-16 19:59:56 +01:00 |
|
Alexandre SPANGARO
|
88bc2dd416
|
Correct insert
|
2018-05-14 20:59:38 +02:00 |
|
Alexandre SPANGARO
|
2f1ac6fad8
|
Fix : Double WHERE on admin/journal_list.php
|
2018-05-13 20:35:07 +02:00 |
|
Laurent Destailleur
|
546da0ceda
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
|
2018-05-05 14:40:39 +02:00 |
|
Laurent Destailleur
|
9c68b81f59
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/projet/class/task.class.php
|
2018-05-05 14:34:54 +02:00 |
|
florian HENRY
|
886ad9d4b6
|
check eldy message
|
2018-05-02 08:45:18 +02:00 |
|
Laurent Destailleur
|
14fd740b04
|
Fix lang must be '' and not empty in email_template
|
2018-05-01 16:25:06 +02:00 |
|
florian HENRY
|
b5d7206519
|
fix 6.0 accountancy multientity
|
2018-05-01 12:02:33 +02:00 |
|
Laurent Destailleur
|
cee4df9b27
|
Merge pull request #8667 from grandoc/new_branch_23_04_2018
clean code
|
2018-04-27 09:46:55 +02:00 |
|
Laurent Destailleur
|
69db960a92
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/activity/perweek.php
|
2018-04-26 18:33:02 +02:00 |
|
Laurent Destailleur
|
83b762b681
|
FIX CVE-2018-9019
|
2018-04-25 16:01:06 +02:00 |
|
Philippe GRAND
|
bf1e5bc618
|
Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018
|
2018-04-24 17:31:10 +02:00 |
|
Laurent Destailleur
|
461ae46cc4
|
FIX When on a high page and searching for a small result, list was not
visible.
|
2018-04-24 11:37:57 +02:00 |
|
Philippe GRAND
|
11d739494d
|
clean code
|
2018-04-23 15:51:21 +02:00 |
|
Laurent Destailleur
|
721ff3e1a4
|
Merge branch 'develop' into new_branch_19_04_2018
|
2018-04-20 01:30:57 +02:00 |
|
Philippe GRAND
|
ecda8bf55d
|
clean and update code
|
2018-04-19 17:07:36 +02:00 |
|
Alexandre SPANGARO
|
fd7bc2e607
|
Accountancy - move to loadLangs
|
2018-04-18 06:20:34 +02:00 |
|
Laurent Destailleur
|
bbfc4a3e17
|
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
|
2018-04-18 03:26:15 +02:00 |
|
Laurent Destailleur
|
8fbde88872
|
Look and feel v8
|
2018-04-15 17:37:49 +02:00 |
|
Laurent Destailleur
|
9e50bbb9b1
|
standardize code
|
2018-04-15 16:35:18 +02:00 |
|
Alexandre SPANGARO
|
251117fcce
|
Accountancy - Small fix
|
2018-04-12 06:07:22 +02:00 |
|
Laurent Destailleur
|
fae509e41d
|
Clean code
|
2018-04-09 14:25:15 +02:00 |
|
Laurent Destailleur
|
a231074012
|
Save search criteria when using "back to" on accounting account
Change type of foreign key to be an integer to avoid CAST in requests
|
2018-04-09 11:31:24 +02:00 |
|
Laurent Destailleur
|
99ed9c4589
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/compta/facture/list.php
|
2018-04-08 13:10:10 +02:00 |
|
Laurent Destailleur
|
aad99bdcc0
|
FIX Removed error when no error on accounting setup page
|
2018-04-07 22:27:42 +02:00 |
|
Alexandre SPANGARO
|
2a50e9e6c4
|
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
|
2018-04-02 19:54:30 +02:00 |
|
Alexandre SPANGARO
|
a5428cc8c7
|
NEW Module Assets
|
2018-04-01 21:26:52 +02:00 |
|
Laurent Destailleur
|
43f8834b28
|
Uniformize code with the new module builder framework
|
2018-03-31 18:48:27 +02:00 |
|
Laurent Destailleur
|
e2cbf903ba
|
Remove deprecated code
|
2018-03-16 10:33:23 +01:00 |
|
Laurent Destailleur
|
c4ca4a5a16
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/tva/index.php
htdocs/install/mysql/data/llx_accounting_category.sql
|
2018-03-15 15:11:18 +01:00 |
|
Laurent Destailleur
|
73005d81a7
|
FIX country must not be mandatory for accounting report groups
|
2018-03-15 11:42:59 +01:00 |
|
Laurent Destailleur
|
db18db9488
|
Clean code
|
2018-03-15 11:27:39 +01:00 |
|
Laurent Destailleur
|
0dfc9af72a
|
FIX multicompany compatibility and fix reports
|
2018-03-06 19:58:13 +01:00 |
|
Laurent Destailleur
|
41638e6dff
|
Fix back link of look and feel v7
|
2018-02-26 09:20:05 +01:00 |
|
Laurent Destailleur
|
48d250b201
|
Help to understand
|
2018-02-20 15:55:58 +01:00 |
|
Laurent Destailleur
|
39c4df723a
|
Fix error management when setting product accounts
|
2018-01-22 21:07:10 +01:00 |
|
Laurent Destailleur
|
15ed7584b8
|
Fix navigation in accounting account card
|
2018-01-11 17:06:06 +01:00 |
|
Laurent Destailleur
|
534cbcb941
|
Debug translation
|
2018-01-03 20:59:35 +01:00 |
|
Alexandre SPANGARO
|
1269d98df2
|
Merge remote-tracking branch 'uptream/develop' into 7.0-7
# Conflicts:
# htdocs/accountancy/admin/export.php
# htdocs/accountancy/class/accountancyexport.class.php
# htdocs/accountancy/journal/expensereportsjournal.php
|
2017-12-09 06:14:34 +01:00 |
|
Alexandre SPANGARO
|
065ef4e5c2
|
Fix : Accountancy some cleaning
|
2017-12-09 06:00:13 +01:00 |
|
Laurent Destailleur
|
b14cb7a97f
|
Debug accountancy
|
2017-11-28 11:49:11 +01:00 |
|
Laurent Destailleur
|
ef786f2271
|
Debug accountancy module
|
2017-11-28 11:31:55 +01:00 |
|
Laurent Destailleur
|
a15a57317b
|
Debug accountancy module
|
2017-11-28 11:12:13 +01:00 |
|
Frédéric FRANCE
|
7f44faf0be
|
correct merge
|
2017-11-06 20:29:57 +01:00 |
|
Frédéric FRANCE
|
ea910adeb2
|
Merge branch 'develop' into accountingexport
|
2017-11-05 21:11:41 +01:00 |
|
Frédéric FRANCE
|
bb252846e3
|
accounting export admin config
|
2017-11-05 11:48:41 +01:00 |
|
Philippe GRAND
|
c31f852f67
|
fix : Warning: A non-numeric value encountered
|
2017-11-03 19:37:54 +01:00 |
|
Laurent Destailleur
|
28ae602b7e
|
NEW Chart of account is loaded when selected into accounting setup
|
2017-10-23 20:42:09 +02:00 |
|
Laurent Destailleur
|
e0c9c00827
|
Add field to list
|
2017-10-23 20:17:57 +02:00 |
|
Laurent Destailleur
|
2a75f09070
|
NEW Use autocompletion on selection of chart of account
|
2017-10-23 20:14:14 +02:00 |
|
Laurent Destailleur
|
ef628025d2
|
NEW Add and edit country for chart of accounts systems
|
2017-10-23 20:01:38 +02:00 |
|
Laurent Destailleur
|
605c9c45e4
|
Merge pull request #7656 from atm-maxime/fix_accounting_mode
Fix #7584
|
2017-10-22 02:21:53 +02:00 |
|
Laurent Destailleur
|
210fb5206c
|
Update index.php
|
2017-10-22 02:21:04 +02:00 |
|
Laurent Destailleur
|
f4db4373ea
|
Update defaultaccounts.php
|
2017-10-22 02:20:29 +02:00 |
|
Maxime Kohlhaas
|
4224ea6c56
|
Fix use conf instead of global var
|
2017-10-18 19:09:29 +02:00 |
|
Laurent Destailleur
|
6fcc0bfdca
|
Remove deprecated option
|
2017-10-13 02:02:13 +02:00 |
|