Frédéric FRANCE
|
5c0976a778
|
doxygen accountancy class
|
2019-11-16 09:58:14 +01:00 |
|
Alexandre SPANGARO
|
3937b45c5f
|
Core - Fix accountancy write social contribution in bookkeeping (Need for FEC format)
|
2019-11-16 07:51:38 +01:00 |
|
Laurent Destailleur
|
0e3d90f145
|
Fix syntax error
|
2019-11-14 12:42:44 +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 |
|
Laurent Destailleur
|
614faa07c1
|
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
|
2019-11-14 08:49:53 +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 |
|
Scrutinizer Auto-Fixer
|
f4aaa8d9bb
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:34:37 +00:00 |
|
Laurent Destailleur
|
c02cd80b75
|
Clean code
|
2019-11-12 10:11:30 +01:00 |
|
Scrutinizer Auto-Fixer
|
c85e54b08c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-12 08:46:08 +00:00 |
|
Laurent Destailleur
|
4f7b698e92
|
Fix filter on sell/purchase status
|
2019-11-11 19:42:54 +01:00 |
|
Laurent Destailleur
|
2ccef4e469
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
|
2019-11-11 19:10:35 +01:00 |
|
Laurent Destailleur
|
5ae5b87b60
|
Fix get bad default value for accounting for sales export
|
2019-11-11 19:07:22 +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 |
|
stickler-ci
|
11f29df93d
|
Fixing style errors.
|
2019-11-10 09:52:03 +00:00 |
|
Philippe GRAND
|
762b70fab7
|
add some comment
|
2019-11-10 10:51:16 +01:00 |
|
Laurent Destailleur
|
9423449237
|
Merge pull request #12308 from olibre/FIX_the_SELECT_examine_more_than_MAX_JOIN_SIZE_rows_12305
FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305
|
2019-11-07 11:26:50 +01:00 |
|
Laurent Destailleur
|
cb26567cfe
|
Revert option ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC into
ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC
|
2019-11-07 11:17:53 +01:00 |
|
Laurent Destailleur
|
1ea8fed9c4
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-07 11:16:20 +01:00 |
|
Laurent Destailleur
|
feef992d39
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-07 11:16:09 +01:00 |
|
Laurent Destailleur
|
de77e39e08
|
FIX #12319 Restore feature ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC.
Now autofill works, option can be reverted in v11.
|
2019-11-07 11:14:36 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Laurent Destailleur
|
d6667675b4
|
Merge pull request #12336 from grandoc/new_branch_05_11_2019
fix bad setEventMessages
|
2019-11-05 10:07:07 +01:00 |
|
Philippe GRAND
|
4acc107191
|
fix bad setEventMessages
|
2019-11-05 10:01:21 +01:00 |
|
O. Libre
|
441eadb883
|
Check if mysqli to avoid perturbing PostgreSQL with "SET SQL_BIG_SELECTS=1"
|
2019-11-05 06:21:35 +01:00 |
|
O. Libre
|
729ed78063
|
FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305
|
2019-11-05 06:21:26 +01:00 |
|
Frédéric FRANCE
|
d059df1348
|
Update thirdparty_lettering_supplier.php
|
2019-11-04 22:51:15 +01:00 |
|
Frédéric FRANCE
|
5113e5e570
|
fix missing newtoken
|
2019-11-04 22:50:19 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
d232b7a387
|
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
|
2019-11-02 13:00:23 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Philippe Grand
|
3692a6602d
|
Update bookkeeping.class.php
|
2019-11-01 11:12:09 +01:00 |
|
stickler-ci
|
a8f7082a3a
|
Fixing style errors.
|
2019-11-01 09:36:18 +00:00 |
|
Philippe GRAND
|
5bafcae767
|
add some comment
|
2019-11-01 10:36:17 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Laurent Destailleur
|
be3f0471ff
|
Fix phpcs
|
2019-10-21 11:27:48 +02:00 |
|
Laurent Destailleur
|
febf9ccd04
|
FIX The Button "Automatic binding" did not use the account intracomm or
export.
|
2019-10-21 05:24:54 +02:00 |
|
Laurent Destailleur
|
776bfabfc4
|
FIX If country not defined keep value empty
|
2019-10-21 05:24:42 +02:00 |
|
Laurent Destailleur
|
6ebd9721da
|
FIX The Button "Automatic binding" did not use the account intracomm or
export.
|
2019-10-21 03:50:57 +02:00 |
|
Laurent Destailleur
|
9b1385ee86
|
FIX If country not defined keep value empty
|
2019-10-21 03:37:44 +02:00 |
|
Frédéric FRANCE
|
360bf55f5b
|
clean indent
|
2019-10-20 01:09:11 +02:00 |
|
Laurent Destailleur
|
63fad7dc07
|
Fix phpcs
|
2019-10-17 20:15:12 +02:00 |
|
Laurent Destailleur
|
b480301a37
|
Look and feel v11
|
2019-10-17 20:11:49 +02:00 |
|
Laurent Destailleur
|
87ec1de78e
|
Start to work on solution to sort permissions by module
|
2019-10-17 18:43:07 +02:00 |
|
Laurent Destailleur
|
40fdcfac7e
|
Merge branch 'develop' into 10.0_closure2
|
2019-10-17 18:16:57 +02:00 |
|
Laurent Destailleur
|
f85899742b
|
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-17 17:48:42 +02:00 |
|
Frédéric FRANCE
|
8761b46e21
|
Update bookkeeping.class.php
|
2019-10-16 22:31:34 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
7960c91955
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/theme/md/style.css.php
|
2019-10-16 17:27:41 +02:00 |
|
Laurent Destailleur
|
75a47eebe0
|
Fix Method fetchAll must NEVER be used for table with more than 1000
record
|
2019-10-16 16:17:51 +02:00 |
|
Alexandre SPANGARO
|
4bb1677079
|
Fix - Accountancy - Various payment - Subledger is not recovered in bank journal
|
2019-10-16 10:39:35 +02:00 |
|
Laurent Destailleur
|
a1c93cb2e6
|
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
Look and feel v11
|
2019-10-15 02:45:12 +02:00 |
|
Laurent Destailleur
|
415379c4f2
|
Link show tutorial in middle
|
2019-10-15 00:27:09 +02:00 |
|
Laurent Destailleur
|
b276abea26
|
Fix missing token in form
Fix date lost after search
|
2019-10-11 16:49:58 +02:00 |
|
Laurent Destailleur
|
b41f7274dd
|
Merge pull request #12085 from aspangaro/11.0_accounting
NEW : Accountancy - List by account - Modify sortfield, nowrap on amo…
|
2019-10-11 16:39:09 +02:00 |
|
Laurent Destailleur
|
fbc4e3b441
|
Update listbyaccount.php
|
2019-10-11 16:37:10 +02:00 |
|
Laurent Destailleur
|
112a074c82
|
Merge pull request #12074 from aspangaro/11.0_LDcompta
Update new LDCompta export
|
2019-10-11 15:53:10 +02:00 |
|
Laurent Destailleur
|
f82f4162c3
|
NEW Look and fill v11: Introduce CSS "trforbreak"
|
2019-10-10 22:42:23 +02:00 |
|
Laurent Destailleur
|
3bf6fac505
|
NEW Can filter on label on invoice in accounting vendor binding pages
|
2019-10-10 22:05:34 +02:00 |
|
Alexandre SPANGARO
|
d43f2bbfae
|
NEW : Accountancy - List by account - Modify sortfield, nowrap on amount and sum of sous-total
|
2019-10-10 11:44:21 +02:00 |
|
Laurent Destailleur
|
aebae5ff83
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
|
2019-10-10 10:37:17 +02:00 |
|
Alexandre SPANGARO
|
04dc9e957f
|
Update new LDCompta Export
|
2019-10-09 16:33:57 +02:00 |
|
Laurent Destailleur
|
9da1d5025b
|
FIX If product account not suggested during bind, it is not preselected
|
2019-10-09 03:15:29 +02:00 |
|
Laurent Destailleur
|
a9c844460b
|
Debug use of widget on Accounting home page
|
2019-10-07 14:39:29 +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
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Alexandre SPANGARO
|
94179f712d
|
Update areacode
|
2019-10-02 08:58:25 +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
|
4d5547636d
|
Accountancy FAQ - Move to toggle()
|
2019-10-02 08:43:35 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Alexandre SPANGARO
|
f91513937a
|
Remove option to hide FAQ
|
2019-09-30 21:37:20 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Alexandre SPANGARO
|
8e42ac8cd0
|
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
|
2019-09-28 22:31:08 +02:00 |
|
Laurent Destailleur
|
6966651d51
|
Standardize code to use dolSqlDateFilter
|
2019-09-28 13:22:05 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +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
|
9f6fe0bf5a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/orders.lang
|
2019-09-14 18:27:58 +02:00 |
|
Laurent Destailleur
|
f45abc1b2a
|
Removed useless header
|
2019-09-14 18:26:38 +02:00 |
|
Laurent Destailleur
|
584549df11
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/index.php
|
2019-09-14 18:25:31 +02:00 |
|
Laurent Destailleur
|
697b25aa82
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-09-14 18:24:00 +02:00 |
|
Laurent Destailleur
|
56e070cd7f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/accountancy/index.php
|
2019-09-14 18:23:20 +02:00 |
|
Frédéric FRANCE
|
00394493eb
|
Update index.php
|
2019-09-12 22:02:39 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
a5f7211730
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
|
2019-09-06 16:10:55 +02:00 |
|
Laurent Destailleur
|
e3fe3d7d4f
|
Fix missing var
|
2019-08-31 13:17:40 +02:00 |
|
Laurent Destailleur
|
defc0a6080
|
Fix missing property
|
2019-08-31 13:15:05 +02:00 |
|
Laurent Destailleur
|
3be635a9bc
|
Fix bad var name
|
2019-08-31 02:41:40 +02:00 |
|
Alexandre SPANGARO
|
14b9460de0
|
FIX Sens of the balance (Debit - Credit in accountancy not contrary)
|
2019-08-29 16:27:25 +02:00 |
|
Laurent Destailleur
|
d304749eca
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-19 10:19:14 +02:00 |
|
Laurent Destailleur
|
21fc089f58
|
FIX Translation of month
|
2019-08-19 10:18:38 +02:00 |
|
Laurent Destailleur
|
477384105f
|
FIX missing test on permission on button to delete ledger record
|
2019-08-18 19:25:36 +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
|
22575bb6e7
|
Fix travis
|
2019-08-04 13:08:38 +02:00 |
|
Laurent Destailleur
|
a03771ce61
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-01 16:30:40 +02:00 |
|
Laurent Destailleur
|
3d8f6dca76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-01 16:30:32 +02:00 |
|
atm-quentin
|
2e3d700ef5
|
NEW export livre Charlemagne
|
2019-08-01 15:19:11 +02:00 |
|
Laurent Destailleur
|
dfc2bebbb6
|
FIX #11400
|
2019-08-01 13:27:07 +02:00 |
|
Laurent Destailleur
|
dca775985f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:41 +02:00 |
|
Laurent Destailleur
|
34f78c555d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:35 +02:00 |
|
Laurent Destailleur
|
192fb45ce7
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/bookkeeping/list.php
htdocs/adherents/card.php
htdocs/compta/sociales/list.php
htdocs/compta/sociales/payments.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/holiday/class/holiday.class.php
htdocs/viewimage.php
|
2019-07-30 20:55:15 +02:00 |
|
Laurent Destailleur
|
334e1a6737
|
Merge pull request #11583 from aspangaro/11.0_LDcompta
NEW Accountancy Add export model LDCompta V9 & higher
|
2019-07-30 15:59:43 +02:00 |
|
Alexandre SPANGARO
|
96380f01c6
|
Test in progress
|
2019-07-29 15:41:53 +02:00 |
|
Alexandre SPANGARO
|
56f124844c
|
Test in progress
|
2019-07-29 10:04:28 +02:00 |
|
Alexandre SPANGARO
|
bb168d7f54
|
Merge branch '9.0' into 9.0_FEC
|
2019-07-29 06:54:48 +02:00 |
|
Alexandre SPANGARO
|
cd22cc70c8
|
FIX FEC Format - Save translation of the journal
|
2019-07-29 06:41:51 +02:00 |
|
Alexandre SPANGARO
|
a2fc3689da
|
Nowrap on amount
|
2019-07-28 22:59:43 +02:00 |
|
Laurent Destailleur
|
a46bfc7a29
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/project.lib.php
|
2019-07-25 17:54:14 +02:00 |
|
Laurent Destailleur
|
4a8377e4fd
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-07-25 17:52:40 +02:00 |
|
Laurent Destailleur
|
6e3fad8f83
|
Fix phpcs
|
2019-07-25 17:42:44 +02:00 |
|
Alexandre SPANGARO
|
2162f2331d
|
Try to fix travis
|
2019-07-24 06:57:42 +02:00 |
|
Laurent Destailleur
|
f5afc50067
|
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
|
2019-07-22 18:47:35 +02:00 |
|
Alexandre SPANGARO
|
7bdfd83288
|
FIX FEC Format - Missing date_creation in general ledger when you add a new transaction
|
2019-07-22 15:15:08 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Alexandre SPANGARO
|
0af1206892
|
Merge branch 'develop' into 11.0_salaries
|
2019-07-19 23:11:06 +02:00 |
|
Alexandre SPANGARO
|
9ab0734415
|
NEW Extrafields on salaries
|
2019-07-19 23:08:24 +02:00 |
|
Laurent Destailleur
|
94f0634492
|
Fix empty link
|
2019-07-19 21:45:11 +02:00 |
|
Alexandre SPANGARO
|
df73345046
|
NEW Accountancy Add export model LDCompta V9 & higher
|
2019-07-19 17:07:55 +02:00 |
|
Laurent Destailleur
|
1053a9d955
|
Trans
|
2019-07-19 16:49:12 +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
|
5778a02ee1
|
FIX #11505
|
2019-07-15 18:44:33 +02:00 |
|
Laurent Destailleur
|
ee109ac568
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-05 17:44:50 +02:00 |
|
Laurent Destailleur
|
9b32763919
|
Fix label for report n ledger for transitionnal bank account on tranfer
|
2019-07-05 15:25:29 +02:00 |
|
Alexandre SPANGARO
|
59f8fb77da
|
Travis
|
2019-06-26 13:59:32 +02:00 |
|
Alexandre SPANGARO
|
c9a36cede6
|
Update work
|
2019-06-26 11:13:34 +02:00 |
|
Alexandre SPANGARO
|
a6a0e2bc77
|
NEW: Accountancy - Add hook bookkeepinglist on general ledger
|
2019-06-26 10:58:36 +02:00 |
|
Laurent Destailleur
|
229dd4d3f5
|
Merge branch 'develop' into 10.0_accounting6
|
2019-06-24 19:59:11 +02:00 |
|
Laurent Destailleur
|
57140b79dc
|
Restore official text of licence
|
2019-06-24 18:30:07 +02:00 |
|
Philippe GRAND
|
2e86344d9a
|
all http addresses should be https now
|
2019-06-24 09:38:26 +02:00 |
|
Philippe GRAND
|
b731edef16
|
all http addresses should be https now
|
2019-06-24 09:37:05 +02:00 |
|
Philippe GRAND
|
40b09f1cf7
|
all http addresses should be https now
|
2019-06-24 09:35:41 +02:00 |
|
Philippe GRAND
|
4d3107c57b
|
all http addresses should be https now
|
2019-06-23 15:43:32 +02:00 |
|
Philippe GRAND
|
d0a14d5aa7
|
all http addresses should be https now
|
2019-06-23 15:41:10 +02:00 |
|
Philippe GRAND
|
fea969dc63
|
all http addresses should be https now
|
2019-06-23 15:39:25 +02:00 |
|
Laurent Destailleur
|
d47cf87c00
|
Look and feel v10
|
2019-06-20 17:59:28 +02:00 |
|
Laurent Destailleur
|
6b5d477476
|
Fix search criteria lost after a delete
|
2019-06-20 17:14:04 +02:00 |
|
Laurent Destailleur
|
c521b9b8f8
|
Fix dispatch in ledger table of withdraw / direct debit payment
|
2019-06-20 16:58:51 +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 |
|
Laurent Destailleur
|
bff6260983
|
Fix syntax error
|
2019-06-20 12:34:29 +02:00 |
|
Laurent Destailleur
|
1a6dc83d4c
|
Fix: default accounting account for eec and export sales were not used.
|
2019-06-20 12:25:58 +02:00 |
|
Laurent Destailleur
|
898d766489
|
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
Allow zero as account number
|
2019-06-20 03:09:37 +02:00 |
|
Alexandre SPANGARO
|
e44b9113b7
|
Nowrap on amount
|
2019-06-19 09:01:57 +02:00 |
|
Alexandre SPANGARO
|
ec7523d3d2
|
Nowrap on amount
|
2019-06-19 09:01:37 +02:00 |
|
Alexandre SPANGARO
|
b8311da262
|
Nowrap on amount
|
2019-06-19 08:56:45 +02:00 |
|
Eric Seigne
|
80d4d8754d
|
allow zero as accountancy code nomber (replace all empty tests by != '')
|
2019-06-17 18:28:11 +02:00 |
|
Laurent Destailleur
|
f00c9a10db
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
|
2019-06-13 12:15:51 +02:00 |
|
Laurent Destailleur
|
d4aa0bfa94
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-06-12 15:42:58 +02:00 |
|
Laurent Destailleur
|
47610d0323
|
Look and feel v10
|
2019-06-12 15:42:48 +02:00 |
|
Laurent Destailleur
|
c0949e3cf9
|
Merge pull request #11175 from aspangaro/10.0_Differentiated_export
NEW Accountancy - Differentiated export
|
2019-06-12 15:42:20 +02:00 |
|
Laurent Destailleur
|
a7e0589071
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-12 13:59:22 +02:00 |
|
Laurent Destailleur
|
44f383c8b9
|
Fix data lost when creation in error
|
2019-06-12 13:57:34 +02:00 |
|
Laurent Destailleur
|
f41606ba15
|
Merge branch '10.0' into 10.0_Differentiated_export
|
2019-06-12 13:27:49 +02:00 |
|
Laurent Destailleur
|
9fa6674e3f
|
Update list.php
|
2019-06-12 13:03:54 +02:00 |
|
Laurent Destailleur
|
1e87635e8e
|
Update sellsjournal.php
|
2019-06-12 13:02:59 +02:00 |
|
Laurent Destailleur
|
eefd30fe1c
|
Update purchasesjournal.php
|
2019-06-12 13:01:04 +02:00 |
|
Laurent Destailleur
|
42915d86ec
|
Update expensereportsjournal.php
|
2019-06-12 12:57:02 +02:00 |
|
Laurent Destailleur
|
a400183bf1
|
Update bankjournal.php
|
2019-06-12 12:52:51 +02:00 |
|
Laurent Destailleur
|
f435f4bd6a
|
Update bankjournal.php
|
2019-06-12 12:49:44 +02:00 |
|
Laurent Destailleur
|
402cbba4ad
|
Update bankjournal.php
|
2019-06-12 12:48:21 +02:00 |
|
Laurent Destailleur
|
3aacd45437
|
Update list.php
|
2019-06-12 12:47:35 +02:00 |
|
Laurent Destailleur
|
1182c0d1f5
|
Update list.php
|
2019-06-12 12:46:44 +02:00 |
|
Laurent Destailleur
|
0f3db439fe
|
Update bankjournal.php
|
2019-06-12 12:38:01 +02:00 |
|
Alexandre SPANGARO
|
b079a8ba64
|
Minwidth100 on amount
|
2019-06-11 05:03:48 +02:00 |
|
Alexandre SPANGARO
|
a96b10db62
|
Fix label country on bind list
|
2019-06-11 05:00:47 +02:00 |
|
Alexandre SPANGARO
|
f3cba86282
|
Better look
|
2019-06-10 07:49:10 +02:00 |
|
florian HENRY
|
21f6daae2a
|
fix scrunitizer
|
2019-06-05 17:38:10 +02:00 |
|
Laurent Destailleur
|
ba2b07917b
|
Fix look and feel v10
|
2019-06-04 02:11:03 +02:00 |
|
Laurent Destailleur
|
cb859b7dfb
|
Look and feel v10
|
2019-06-04 01:30:17 +02:00 |
|
Laurent Destailleur
|
29d9983669
|
Fix look and feel v10
|
2019-06-04 01:22:26 +02:00 |
|
Laurent Destailleur
|
69efc54fb6
|
Merge pull request #11263 from atm-arnaud/9.0_FIX_productaccount_buy_page
FIX productaccount buylist with pages
|
2019-05-29 13:52:53 +02:00 |
|
Laurent Destailleur
|
b6f4cab20d
|
Merge pull request #11247 from aspangaro/develop
Accountancy - Use Ansi on Agiris model export & indent
|
2019-05-29 12:23:25 +02:00 |
|
Laurent Destailleur
|
fd0eb47b35
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/card.php
|
2019-05-29 09:57:48 +02:00 |
|
Laurent Destailleur
|
35b021f203
|
Fix phpcs
|
2019-05-29 09:53:54 +02:00 |
|
atm-arnaud
|
a853764f6d
|
FIX productaccount buylist with pages
|
2019-05-28 15:03:36 +02:00 |
|
Alexandre SPANGARO
|
4be46d35b0
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-05-26 14:07:23 +02:00 |
|
Laurent Destailleur
|
19ff0120ff
|
# WARNING: head commit changed in the meantime
Removed uselesss files (replaced by DebugBar)
|
2019-05-26 11:42:00 +02:00 |
|
Alexandre SPANGARO
|
09faf3aa5b
|
Accountancy - Use Ansi on Agiris model export & indent
|
2019-05-24 21:48:36 +02:00 |
|
Laurent Destailleur
|
bad565cc64
|
Fix syntax error
|
2019-05-24 18:13:24 +02:00 |
|
Laurent Destailleur
|
0fc7ad7c1f
|
Add one param to fetch of accounting account to solve chart import
|
2019-05-24 18:05:29 +02:00 |
|
Laurent Destailleur
|
769fbdb429
|
FIX the id was not loaded in fetch of accounting system
|
2019-05-24 17:39:37 +02:00 |
|
Alexandre SPANGARO
|
34a91ef96f
|
Apply button reexport on view list
|
2019-05-23 11:21:41 +02:00 |
|
Alexandre SPANGARO
|
2085958a69
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-23 11:10:07 +02:00 |
|
Alexandre SPANGARO
|
4ba8cf0641
|
Fix
|
2019-05-23 11:08:06 +02:00 |
|
Alexandre SPANGARO
|
d4384f507d
|
WIP
|
2019-05-23 09:25:09 +02:00 |
|
Alexandre SPANGARO
|
65070afce4
|
WIP
|
2019-05-22 17:22:49 +02:00 |
|
Alexandre SPANGARO
|
a182b89bb0
|
Merge branch 'develop' into 10.0_closure2
|
2019-05-22 13:52:13 +02:00 |
|
a-schild
|
fff133b8a5
|
PSR_2 Format of code
|
2019-05-22 11:40:58 +02:00 |
|
a-schild
|
a823882f76
|
Some more formatting fixes
|
2019-05-22 10:57:59 +02:00 |
|
a-schild
|
5f25398c5c
|
Corrected code format and documentation
|
2019-05-22 10:34:39 +02:00 |
|
a-schild
|
d54c1aca01
|
Add accountancy export option for Sage50 Swiss
|
2019-05-22 10:01:25 +02:00 |
|
Laurent Destailleur
|
1e85444e18
|
Merge pull request #11222 from aspangaro/10.0_openconcerto
Fix Accountancy Export OpenConcerto
|
2019-05-21 22:41:25 +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 |
|
Alexandre SPANGARO
|
5a05cc184b
|
Fix Accountancy Export OpenConcerto
|
2019-05-19 10:48:43 +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 |
|
Laurent Destailleur
|
bd1ed4f7ac
|
Merge branch 'develop' into 10.0_Differentiated_export
|
2019-05-16 21:26:20 +02:00 |
|
Alexandre SPANGARO
|
f123f9951f
|
NEW Add OpenConcerto export format
|
2019-05-15 12:16:03 +02:00 |
|
Alexandre SPANGARO
|
7c9ccee64d
|
NEW Accountancy - Differentiated export
|
2019-05-14 05:45:36 +02:00 |
|
Alexandre SPANGARO
|
d4e2fab983
|
Replace term "Advanced accountancy" by Accountancy (Double entries)
|
2019-05-13 22:25:15 +02:00 |
|
John BOTELLA
|
b0e780fab0
|
Fix travis
|
2019-05-13 09:39:45 +02:00 |
|
John BOTELLA
|
f296093f8d
|
fix travis
|
2019-05-10 15:52:46 +02:00 |
|
Laurent Destailleur
|
bb4cda6719
|
Fix phpcs
|
2019-05-08 19:08:40 +02:00 |
|
Laurent Destailleur
|
590b1d1e90
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
|
2019-05-08 18:24:50 +02:00 |
|
Laurent Destailleur
|
e37519ed89
|
Fix label
|
2019-05-07 22:43:59 +02:00 |
|
Alexandre SPANGARO
|
b30929af6d
|
WIP
|
2019-05-06 11:05:00 +02:00 |
|
Alexandre SPANGARO
|
4baffae297
|
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
|
2019-05-05 22:43:02 +02:00 |
|
Alexandre SPANGARO
|
99b068b625
|
FIX sortfield on lettering function
|
2019-05-05 21:46:56 +02:00 |
|
Alexandre SPANGARO
|
4e16992796
|
WIP
|
2019-05-05 14:07:42 +02:00 |
|
Laurent Destailleur
|
204fc329a6
|
Merge pull request #11121 from frederic34/patch-2
Update thirdparty_lettering_customer.php
|
2019-05-04 12:46:35 +02:00 |
|
Laurent Destailleur
|
60bf3452c3
|
Hide export in EEC for non european countries
|
2019-05-04 12:26:54 +02:00 |
|
Frédéric FRANCE
|
0c5d9de13f
|
Update thirdparty_lettering_supplier.php
|
2019-05-04 10:38:49 +02:00 |
|
Frédéric FRANCE
|
c595a591a2
|
Update thirdparty_lettering_customer.php
|
2019-05-04 10:37:29 +02:00 |
|
Frédéric FRANCE
|
fc520810b7
|
Update thirdparty_lettering_customer.php
|
2019-05-04 10:17:04 +02:00 |
|
Frédéric FRANCE
|
4e9b9b61d8
|
Update thirdparty_lettering_supplier.php
|
2019-05-04 10:16:27 +02:00 |
|
Frédéric FRANCE
|
4b8083832c
|
Update thirdparty_lettering_customer.php
|
2019-05-04 10:13:44 +02:00 |
|
Alexandre SPANGARO
|
be1eb7829e
|
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
|
2019-05-04 07:41:23 +02:00 |
|
Alexandre SPANGARO
|
0359b1820a
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-05-03 14:10:57 +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
|
dd4e70efe7
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/accountancy/class/lettering.class.php
|
2019-05-03 12:14:17 +02:00 |
|
Laurent Destailleur
|
6797c95164
|
Fix syntax error
|
2019-05-03 12:10:29 +02:00 |
|
Alexandre SPANGARO
|
7bd99c0eee
|
fix
|
2019-05-02 14:08:28 +02:00 |
|
Alexandre SPANGARO
|
cbe23741eb
|
FIX Massive debug in lettering function
|
2019-05-02 14:06:55 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Alexandre SPANGARO
|
6f9e71dae3
|
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
|
2019-04-24 21:15:54 +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
|
a8b645c7a3
|
Fix warnings
|
2019-04-23 13:07:46 +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 |
|
Laurent Destailleur
|
61428b9c00
|
Fix use standard product country code if country of buyer not defined
|
2019-04-19 12:19:45 +02:00 |
|
Laurent Destailleur
|
eab474e23a
|
Update list.php
|
2019-04-19 12:10:40 +02:00 |
|
Laurent Destailleur
|
265671a5f3
|
Update list.php
|
2019-04-19 12:00:06 +02:00 |
|
Alexandre SPANGARO
|
033e9b9f22
|
FIX Accounting Customer dispatch with intra/export
|
2019-04-19 06:48:51 +02:00 |
|
Alexandre SPANGARO
|
660a1cea1d
|
NEW Accounting - Add rights on export, delete operations in ledger
|
2019-04-17 07:26:39 +02:00 |
|
ATM john
|
07e6ce5460
|
Appli function to links
|
2019-04-15 21:33:31 +02:00 |
|
Alexandre SPANGARO
|
9957b8aed5
|
WIP - FEC - Validate
|
2019-04-15 09:07:36 +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
|
b8d3110266
|
Merge pull request #10916 from frederic34/patch-2
Update EBP export
|
2019-04-11 16:56:16 +02:00 |
|
Laurent Destailleur
|
d7f980fda0
|
NEW Add picto of deletion on mass action combo lists
|
2019-04-09 01:22:59 +02:00 |
|
Laurent Destailleur
|
321ffb859b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/perweek.php
|
2019-04-08 14:09:18 +02:00 |
|
Alexandre SPANGARO
|
ba34b601b3
|
FIX: MultiEntity in lettering functionality
|
2019-04-04 16:44:36 +02:00 |
|
Alexandre SPANGARO
|
6f1b496373
|
Merge remote-tracking branch 'upstream/develop' into 10.0_WARNING
|
2019-03-28 11:57:59 +01:00 |
|
Laurent Destailleur
|
c62d147c60
|
Auto clean search field to avoid to have 2 conflict search criteria
|
2019-03-25 16:47:20 +01:00 |
|
Frédéric FRANCE
|
f9c1289a5b
|
Update EBP export
@aspangaro @Darkjeff can you confirm that montant must be always >0 (in case of credit)
|
2019-03-25 14:52:30 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Philippe GRAND
|
5677177ebc
|
update with html5 compliant code
|
2019-03-19 13:45:50 +01:00 |
|
Philippe GRAND
|
d118d269a2
|
update with html5 compliant code
|
2019-03-19 13:44:21 +01:00 |
|
Laurent Destailleur
|
eab11ce743
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2019-03-19 13:14:44 +01:00 |
|
Laurent Destailleur
|
dbe15d3685
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-19 13:10:17 +01:00 |
|
Laurent Destailleur
|
8664594fc8
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-19 13:09:39 +01:00 |
|
Philippe Grand
|
2a91629e57
|
Update accountingaccount.class.php
|
2019-03-18 12:24:52 +01:00 |
|
Philippe GRAND
|
c98f3ae4b3
|
add comments
|
2019-03-18 10:20:24 +01:00 |
|
Laurent Destailleur
|
ae35c982af
|
Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit
FIX : need to round with 2 decimals to avoid movements not correctly balanced
|
2019-03-16 14:27:03 +01:00 |
|
Frédéric FRANCE
|
4822a2d396
|
Update accountancycategory.class.php
|
2019-03-16 09:51:57 +01:00 |
|
Laurent Destailleur
|
63b6900f2c
|
Fix phpcs
|
2019-03-15 16:09:20 +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
|
a0d8ba268e
|
Update doc with the new menu entries
|
2019-03-14 16:28:32 +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 |
|
Laurent Destailleur
|
39e6e71b0d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
|
2019-03-14 14:20:34 +01:00 |
|
Laurent Destailleur
|
3073567763
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-14 14:17:52 +01:00 |
|
Frédéric FRANCE
|
9b61577bf7
|
Update card.php
It seems like GETPOST('fk_doc', 'int') of type string or string[] is incompatible with the declared type integer of property $fk_doc
|
2019-03-10 21:04:35 +01:00 |
|
Alexandre SPANGARO
|
49f72b6a9a
|
Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT
|
2019-03-09 05:50:16 +01:00 |
|
Alexandre SPANGARO
|
895367060c
|
Fix some small error
|
2019-03-09 05:31:05 +01:00 |
|
Alexandre SPANGARO
|
d926657534
|
FIX: Accountancy - Format EBP import
Add doc
|
2019-03-08 10:57:14 +01:00 |
|
Frédéric FRANCE
|
a836c75d70
|
replace html by html5 in accountancy
|
2019-03-03 10:31:46 +01:00 |
|
Laurent Destailleur
|
a5711a51ab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
|
2019-03-02 18:30:17 +01:00 |
|
Frédéric FRANCE
|
e5e1a0b07d
|
The property $fk_doc was declared of type integer
|
2019-02-28 19:15:50 +01:00 |
|
Frédéric FRANCE
|
089875b8a2
|
add visibility
|
2019-02-27 17:53:52 +01:00 |
|
Frédéric FRANCE
|
5a4ac82880
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-27 08:23:29 +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 |
|
Laurent Destailleur
|
7618a7348f
|
Merge branch 'develop' into 10.0_accountancy2
|
2019-02-27 01:51:01 +01:00 |
|
Alexandre SPANGARO
|
1c59554806
|
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
|
2019-02-25 22:22:31 +01:00 |
|
Frédéric FRANCE
|
42a1387218
|
wip
|
2019-02-25 00:56:48 +01:00 |
|
Laurent Destailleur
|
6b46a927f1
|
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
|
2019-02-24 20:53:54 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
Frédéric FRANCE
|
70350231ca
|
Update accountancycategory.class.php
|
2019-02-23 18:49:28 +01:00 |
|
Laurent Destailleur
|
cdf85b0d00
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-23 16:02:35 +01:00 |
|
Laurent Destailleur
|
9ba6e3f8f5
|
FIX #10638
|
2019-02-23 15:57:57 +01:00 |
|
Philippe GRAND
|
33164bcb3e
|
fix : When comparing two booleans, it is generally considered safer to use the strict comparison operator.
|
2019-02-21 14:25:09 +01:00 |
|
Laurent Destailleur
|
acc0ac2c88
|
Fix line feed
|
2019-02-20 05:05:26 +01:00 |
|
Laurent Destailleur
|
d5c2984266
|
Merge pull request #10622 from aspangaro/10.0_portal2
NEW: Add hooks in accountancy index
|
2019-02-19 13:29:46 +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 |
|
Alexandre SPANGARO
|
1b213ccbd6
|
NEW: Add hooks in accountancy index
|
2019-02-17 09:11:11 +01:00 |
|
Alexandre SPANGARO
|
5142d5b631
|
Fix also in binding page
|
2019-02-13 13:43:59 +01:00 |
|
Laurent Destailleur
|
205152501e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
|
2019-02-12 13:39:39 +01:00 |
|
Laurent Destailleur
|
00eb95b660
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-12 13:36:32 +01:00 |
|
Laurent Destailleur
|
53a8f1cd3b
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-02-12 13:36:05 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +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 |
|
Alexandre SPANGARO
|
2dc4edb68c
|
FIX: Accountancy - Add transaction with multicompany use all the time 1st entity
|
2019-02-11 11:36:12 +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 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
gauthier
|
2142ccee8a
|
FIX : better method
|
2019-02-08 15:17:40 +01:00 |
|
Maxime Kohlhaas
|
da361f0ea5
|
Fix wrong column name in purchase journal
|
2019-02-08 12:24:07 +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 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
afd53a99c2
|
Fix merge
|
2019-02-03 18:21:03 +01:00 |
|
Laurent Destailleur
|
e309261140
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-03 18:19:58 +01:00 |
|
Laurent Destailleur
|
456e78b7cf
|
FIX #10485
|
2019-02-03 17:45:31 +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 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Philippe GRAND
|
a0e87fbfd2
|
update with html5 compliant code
|
2019-01-30 19:38:04 +01:00 |
|
Philippe GRAND
|
e12f66e3d9
|
update with html5 compliant code
|
2019-01-30 19:34:33 +01:00 |
|
Philippe GRAND
|
06055ed586
|
update with html5 compliant code
|
2019-01-30 19:32:08 +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
|
1eb57b6542
|
update with html5 compliant code
|
2019-01-30 09:32:19 +01:00 |
|
Philippe GRAND
|
cda89c65cd
|
update with html5 compliant code
|
2019-01-30 09:30:55 +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
|
12e75cb8c9
|
Merge pull request #10401 from aspangaro/10.0_accountancy2
NEW: Automatically binding for intra/export accountancy code in customer list
|
2019-01-27 18:06:08 +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 |
|
Laurent Destailleur
|
999f84458f
|
Merge pull request #10415 from grandoc/new_branch_25_01_2019
fix : The condition == 3 is always false
|
2019-01-26 14:01:35 +01:00 |
|
Laurent Destailleur
|
d3decebd83
|
Merge pull request #10418 from grandoc/new_branch_26_01_2019
fix : bad type cast
|
2019-01-26 14:00:59 +01:00 |
|
Laurent Destailleur
|
a10203bfad
|
Merge pull request #10378 from rycks/exportJournaux
Export journaux
|
2019-01-26 13:51:41 +01:00 |
|
Philippe Grand
|
a1b90638d4
|
Update card.php
fix
|
2019-01-26 09:10:16 +01:00 |
|
Philippe GRAND
|
b1ea5af876
|
fix : bad type cast
|
2019-01-26 09:02:49 +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 |
|
Alexandre SPANGARO
|
9ff848210f
|
NEW: Automatically binding for intra/export accountancy code
|
2019-01-23 22:14:13 +01:00 |
|
Philippe GRAND
|
1f3be71d8b
|
update with html5 compliant code
|
2019-01-21 21:22:12 +01:00 |
|
Philippe GRAND
|
1741e77996
|
update with html5 compliant code
|
2019-01-21 21:19:42 +01:00 |
|
Philippe GRAND
|
9ce73dfa71
|
update with html5 compliant code
|
2019-01-21 21:15:53 +01:00 |
|
Philippe GRAND
|
f045cf353b
|
update with html5 compliant code
|
2019-01-21 21:13:42 +01:00 |
|
Laurent Destailleur
|
b868397902
|
Fix colspan
|
2019-01-21 02:27:13 +01:00 |
|
Eric
|
fdb1e1145c
|
add if ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL
|
2019-01-20 20:58:52 +01:00 |
|
Eric
|
71f7aa9503
|
use transnoentitiesnoconv instead of html_entity_decode
|
2019-01-20 20:55:59 +01:00 |
|
Laurent Destailleur
|
3ddfcbe3bb
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
|
2019-01-20 20:36:45 +01:00 |
|
Laurent Destailleur
|
da2ba20653
|
Try fix for postgresql
|
2019-01-20 20:31:12 +01:00 |
|
Laurent Destailleur
|
f7c11ec7f4
|
Fix unit test on accounting
|
2019-01-20 17:06:24 +01:00 |
|
Eric
|
88efc830fe
|
re enable export for expensereportsjournal
|
2019-01-20 15:25:53 +01:00 |
|
Eric
|
df5aa33022
|
add html_entity_decode on fields for export process (for example ´ -> é)
|
2019-01-20 15:25:24 +01:00 |
|
Eric
|
13586ff3d8
|
typo on my previus patch MainAccountForSupplierssNotDefined -> MainAccountForSuppliersNotDefined
|
2019-01-20 15:24:38 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Laurent Destailleur
|
2ce8529c06
|
Merge pull request #10346 from grandoc/new_branch_16_01_2019
update with html5 compliant code
|
2019-01-16 19:39:31 +01:00 |
|
Philippe Grand
|
98ebc0a667
|
Update index.php
|
2019-01-16 19:24:15 +01:00 |
|
Philippe Grand
|
551a1a5e58
|
Update lines.php
|
2019-01-16 19:23:41 +01:00 |
|
Philippe Grand
|
3cc68aca21
|
Update index.php
|
2019-01-16 19:23:08 +01:00 |
|
Philippe Grand
|
13ea2d93dd
|
Update index.php
|
2019-01-16 19:22:29 +01:00 |
|
Philippe Grand
|
5810fa9acd
|
Update list.php
|
2019-01-16 19:21:19 +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 |
|
atm-quentin
|
013c078c8b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
|
2019-01-16 10:52:46 +01:00 |
|
Laurent Destailleur
|
05cdf895e8
|
Allow supplier code to be '0', but not empty ('')
|
2019-01-09 11:10:44 +01:00 |
|
Laurent Destailleur
|
86f0d6c26f
|
FIX Warning on non complete setup
|
2019-01-09 11:02:06 +01:00 |
|
Laurent Destailleur
|
5d0ff28556
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/societe/card.php
|
2019-01-08 01:56:03 +01:00 |
|
Laurent Destailleur
|
d2f6899346
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/admin/defaultvalues.php
htdocs/societe/card.php
|
2019-01-08 01:53:00 +01:00 |
|
Laurent Destailleur
|
6e078105ab
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
|
2019-01-06 01:22:10 +01:00 |
|
ldestailleur
|
0ce514079b
|
FIX Button journalize grey when mandatroy setup not done
|
2019-01-05 12:51:08 +01:00 |
|
ldestailleur
|
451b3e30cc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
|
2019-01-04 19:36:20 +01:00 |
|
Laurent Destailleur
|
c690b92410
|
Merge pull request #10277 from aspangaro/9.0_accountancy_html
FIX: #10221 Html codes in accounting export
|
2019-01-02 19:52:18 +01:00 |
|