Alexandre SPANGARO
|
f273273129
|
FIX: Accountancy - Retire entire opening balance feature
|
2020-12-22 06:57:55 +01:00 |
|
Laurent Destailleur
|
1d6e2a01a6
|
Merge pull request #15762 from aspangaro/13b1
FIX: Accountancy - Quadra export format - Manage negative amount
|
2020-12-16 15:24:14 +01:00 |
|
Alexandre SPANGARO
|
c5ee976c7e
|
NEW: Accountancy - In ledger & journals, show link on bank transaction
|
2020-12-16 06:38:17 +01:00 |
|
Alexandre SPANGARO
|
b01a9d6cc3
|
FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger
|
2020-12-16 05:32:36 +01:00 |
|
Alexandre SPANGARO
|
ca6b8176e9
|
Merge remote-tracking branch 'upstream/develop' into 13b1
|
2020-12-16 04:32:26 +01:00 |
|
Laurent Destailleur
|
cee63335a2
|
FIX #15754 Mor complete PR
|
2020-12-15 13:38:21 +01:00 |
|
Alexandre SPANGARO
|
5ec7b01fb4
|
FIX: Link to subaccount ledger
|
2020-12-15 09:34:46 +01:00 |
|
Frédéric FRANCE
|
eac2a42b1c
|
remove warning
|
2020-12-06 16:44:21 +01:00 |
|
Scrutinizer Auto-Fixer
|
6df4954b20
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-12-01 01:41:19 +00:00 |
|
Laurent Destailleur
|
00ad6df395
|
Fight against $_POST
|
2020-11-30 14:47:07 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Laurent Destailleur
|
52cc08f5da
|
FIX option "Show subtotal" on the balance report
|
2020-11-26 16:12:55 +01:00 |
|
Laurent Destailleur
|
e272130a6a
|
Fix phpcs
|
2020-11-26 08:40:08 +01:00 |
|
Laurent Destailleur
|
f91226a9f0
|
Merge pull request #15537 from maboelfotoh/maboelfotoh-fix-pr-13067
FIX #13067 including opening balance in calculation of displayed balance
|
2020-11-25 17:54:09 +01:00 |
|
Muhammad Aboelfotoh
|
551256b779
|
FIX #13067 including opening balance in calculation of displayed balance
|
2020-11-25 15:11:09 +00:00 |
|
Laurent Destailleur
|
941bf26be1
|
Merge pull request #15488 from aspangaro/14a5
NEW: Accountancy - Add hooks 'addMoreActionsButtons' on ledger and jo…
|
2020-11-23 22:16:11 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Alexandre SPANGARO
|
248e49ccd1
|
NEW: Accountancy - Add hooks 'addMoreActionsButtons' on ledger and journal
|
2020-11-22 22:19:36 +01:00 |
|
Laurent Destailleur
|
026d73d9f9
|
Update thirdparty_lettering_supplier.php
|
2020-11-12 12:39:56 +01:00 |
|
Frédéric FRANCE
|
dea92299f3
|
Update thirdparty_lettering_supplier.php
|
2020-11-10 21:54:34 +01:00 |
|
Alexandre SPANGARO
|
25fd41fa93
|
Dev multifilter jounal on ledger (complete)
|
2020-11-10 04:17:07 +01:00 |
|
Florian HENRY
|
1bdd617feb
|
NEW: Multiselect ledger account code filter on book keeping list
|
2020-11-07 15:31:27 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Laurent Destailleur
|
fce9fea099
|
Fix params
|
2020-10-31 15:13:03 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Laurent Destailleur
|
3cefb5f336
|
Update listbyaccount.php
|
2020-10-30 17:59:33 +01:00 |
|
Alexandre SPANGARO
|
86ee75363a
|
NEW: Accountancy - Add a ledger for subaccount
|
2020-10-28 09:49:38 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Philippe GRAND
|
a8b25e32f0
|
fix : deprecated
|
2020-10-22 16:40:58 +02:00 |
|
Philippe GRAND
|
d5e456fd36
|
fix : deprecated
|
2020-10-22 16:40:03 +02:00 |
|
Philippe GRAND
|
52b602b1ce
|
fix : deprecated
|
2020-10-22 16:38:02 +02:00 |
|
Laurent Destailleur
|
efc5dedab4
|
Fix format number on screen
|
2020-10-09 12:52:42 +02:00 |
|
Laurent Destailleur
|
ca189099dd
|
Look and feel v13
|
2020-10-06 17:00:17 +02:00 |
|
Laurent Destailleur
|
4701656d95
|
Fix look and field v13
|
2020-10-06 13:08:20 +02:00 |
|
Laurent Destailleur
|
1c38379622
|
Better message
|
2020-10-06 12:22:58 +02:00 |
|
Laurent Destailleur
|
38acd83f4d
|
Review some titles and tooltip help to be more clear.
|
2020-10-06 12:17:33 +02:00 |
|
Alexandre SPANGARO
|
6745c377a6
|
Double line
|
2020-10-05 22:35:12 +02:00 |
|
Alexandre SPANGARO
|
6a0f2233a6
|
NEW Accountancy - Move to real ledger, real journals, menu disposition
|
2020-10-05 21:44:39 +02:00 |
|
Laurent Destailleur
|
f442dac2c9
|
Add token on most GET url for admin action
|
2020-09-30 15:13:28 +02:00 |
|
Tobias Sekan
|
a72519f353
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-23 09:09:42 +02:00 |
|
Laurent Destailleur
|
7dd69a2b2b
|
Fix escape
|
2020-09-19 20:11:04 +02:00 |
|
Laurent Destailleur
|
2d38644ae1
|
Sanitize sortfield
|
2020-09-18 17:13:01 +02:00 |
|
Tobias Sekan
|
b2a953ed5b
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-18 12:21:41 +02:00 |
|
Sekan, Tobias
|
1b04ef8aad
|
Add function to all list that support $socid
|
2020-09-18 10:36:40 +02:00 |
|
Laurent Destailleur
|
9a758b7edd
|
FIX #yogosha4483
|
2020-09-17 14:31:25 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
1f8278c8ca
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-09-12 04:42:59 +02:00 |
|
Laurent Destailleur
|
d44952011f
|
Update balance.php
|
2020-09-12 01:16:02 +02:00 |
|
Alexandre SPANGARO
|
04329c38b3
|
FIX - Accountancy balance Error SQL on entity
|
2020-09-11 06:42:22 +02:00 |
|
Alexandre SPANGARO
|
939933f4f7
|
Add some language key
|
2020-09-08 04:24:18 +02:00 |
|
Alexandre SPANGARO
|
ca32a93c0b
|
NEW Link on balance to bookkeeping
|
2020-09-07 22:03:41 +02:00 |
|
Alexandre SPANGARO
|
fb88c68ddb
|
New Accountancy - Balance - Move to getNomUrl on accounting account
|
2020-09-02 05:15:58 +02:00 |
|
Laurent Destailleur
|
ad87e753b4
|
Clean trim on GETPOST (already included inside GETPOST when not 'none'
|
2020-08-28 21:27:50 +02:00 |
|
Laurent Destailleur
|
4ecd15b7ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
|
2020-08-27 21:57:42 +02:00 |
|
Alexandre SPANGARO
|
0adf267f66
|
Fix Accountancy Listbyaccount Error missing formfile->getDocumentsLink
|
2020-08-25 21:31:04 +02:00 |
|
Laurent Destailleur
|
a53f7ff9c9
|
Merge pull request #14428 from asolslk/patch-3
Fix group by finance account error #14221
|
2020-08-08 13:33:10 +02:00 |
|
Laurent Destailleur
|
f8557879fb
|
Update listbyaccount.php
|
2020-08-08 13:15:29 +02:00 |
|
asolslk
|
41bb83f107
|
Update listbyaccount.php
fixed #14221
|
2020-08-08 19:10:50 +08:00 |
|
stickler-ci
|
d3cb704a0e
|
Fixing style errors.
|
2020-08-08 11:05:19 +00:00 |
|
asolslk
|
5291746252
|
Update listbyaccount.php
fixed #14408
|
2020-08-08 19:04:38 +08:00 |
|
Laurent Destailleur
|
6c2d70d43b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-17 19:27:39 +02:00 |
|
Laurent Destailleur
|
32eaa9137c
|
FIX #14034
|
2020-06-17 18:29:29 +02:00 |
|
Laurent Destailleur
|
7d3c176727
|
Prepare convertion of field "montant" into "amount"
|
2020-06-17 12:45:56 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
43dcd9beb5
|
add new rule
|
2020-05-21 00:02:33 +02:00 |
|
Laurent Destailleur
|
bd564486ff
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-17 20:03:09 +02:00 |
|
Laurent Destailleur
|
af46108cc4
|
Look and feel v12
|
2020-05-17 13:34:16 +02:00 |
|
Laurent Destailleur
|
70fc74008a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
|
2020-05-15 17:19:43 +02:00 |
|
Laurent Destailleur
|
86ff60f161
|
Fix break line and set of opportunity fields
|
2020-05-15 15:50:50 +02:00 |
|
Scrutinizer Auto-Fixer
|
9699ee7263
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-05-15 11:55:31 +00:00 |
|
Alexandre SPANGARO
|
6b57ae4fcb
|
Merge remote-tracking branch 'upstream/develop' into 12.0_a27
|
2020-05-12 07:27:35 +02:00 |
|
Alexandre SPANGARO
|
0dccc9cbeb
|
Debug colspan
|
2020-05-12 07:27:20 +02:00 |
|
Laurent Destailleur
|
e5fa5be0e5
|
Merge pull request #13861 from aspangaro/12.0_a26
NEW Bookkeeping by account - Look & feel v12
|
2020-05-12 03:02:32 +02:00 |
|
Laurent Destailleur
|
4584fa1aa6
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
|
2020-05-11 19:43:06 +02:00 |
|
Alexandre SPANGARO
|
04480847df
|
NEW Accountancy balance - Add a button ShowSubtotalByGroup
|
2020-05-10 08:28:03 +02:00 |
|
stickler-ci
|
ff578198d6
|
Fixing style errors.
|
2020-05-10 04:35:52 +00:00 |
|
Alexandre SPANGARO
|
f40e978475
|
Fix delbookkeepingyear - add hook printFieldPreListTitle - Look & Feel v12
|
2020-05-10 06:28:50 +02:00 |
|
Alexandre SPANGARO
|
40ffbbe616
|
Debug
|
2020-05-08 13:28:56 +02:00 |
|
Alexandre SPANGARO
|
a49635a825
|
NEW Bookkeeping by account - Add selectfields & hook
|
2020-05-08 07:45:01 +02:00 |
|
Maxime Kohlhaas
|
1a9afe6b20
|
Fix missing hook params for printFieldListValue
|
2020-05-08 01:40:25 +02:00 |
|
Laurent Destailleur
|
042fb4641f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/de_DE/install.lang
htdocs/langs/de_DE/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/projects.lang
|
2020-04-21 18:33:11 +02:00 |
|
Laurent Destailleur
|
f8ae5d9972
|
Fix Do not show value if null
|
2020-04-21 12:00:14 +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 |
|
Laurent Destailleur
|
59f66ce9bd
|
Type of var
|
2020-03-25 11:32:24 +01:00 |
|
Laurent Destailleur
|
a5379c7144
|
FIX All forms must use newToken()
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
|
2020-03-24 13:14:23 +01:00 |
|
Laurent Destailleur
|
1ff15e1fd9
|
FIX All forms must use newToken()
|
2020-03-24 13:10:35 +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 |
|
Scrutinizer Auto-Fixer
|
4ab671338b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-06 13:11:44 +00:00 |
|
Alexandre SPANGARO
|
cdca4ca0aa
|
NEW: Bookkeeping - Add link to document & pdf
|
2020-03-02 09:01:25 +01:00 |
|
Alexandre SPANGARO
|
be8ed42450
|
NEW: Bookkeeping - Add link to document & pdf
|
2020-03-01 23:17:40 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Laurent Destailleur
|
a312adf2b0
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
|
2020-02-14 19:57:31 +01:00 |
|
Laurent Destailleur
|
d3d572c8d3
|
FIX Avoid to download the export if we just press enter to refresh form
|
2020-02-14 19:55:50 +01:00 |
|
Laurent Destailleur
|
a7df72ee6f
|
FIX #13067
|
2020-02-14 19:34:26 +01:00 |
|
Muhammad Aboelfotoh
|
ce6cf04028
|
Add new view for balance.php that additionally shows opening balance
|
2020-02-13 13:53:07 +00:00 |
|
oscim
|
ed68ae0574
|
Update thirdparty_lettering_supplier.php
fix form in fiscalyear lasted validated
|
2020-01-31 08:50:41 +01:00 |
|
Alexandre SPANGARO
|
074e55fca5
|
NEW: Accountancy - General ledger - Add an option to search not reconciled line
|
2020-01-28 22:56:26 +01:00 |
|
Alexandre SPANGARO
|
d5ff006171
|
NEW: Accountancy - General ledger - Add an option to search not lettering line
|
2020-01-27 05:20:48 +01:00 |
|
Alexandre SPANGARO
|
f4cd3236b1
|
Fix : Accounting - error on right
|
2020-01-19 21:59:01 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
5c8733a84b
|
More complete message
|
2019-12-16 19:30:18 +01:00 |
|
Laurent Destailleur
|
d22cd5c321
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
|
2019-12-16 19:09:53 +01:00 |
|
Laurent Destailleur
|
65abe7532c
|
Fix error message not reported when deleting record in ledger.
|
2019-12-16 19:05:32 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Frédéric FRANCE
|
66805a502a
|
doxygen
|
2019-12-11 22:53:57 +01:00 |
|
Philippe GRAND
|
9996c1ca7a
|
fix : invoid sql injection
|
2019-11-21 09:49:53 +01:00 |
|
Philippe GRAND
|
54d67de538
|
fix : invoid sql injection
|
2019-11-21 09:44:13 +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
|
c02cd80b75
|
Clean code
|
2019-11-12 10:11:30 +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 |
|
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 |
|
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
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +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 |
|
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
|
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
|
f82f4162c3
|
NEW Look and fill v11: Introduce CSS "trforbreak"
|
2019-10-10 22:42:23 +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
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +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 |
|
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
|
3d8f6dca76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-01 16:30:32 +02:00 |
|
Laurent Destailleur
|
dfc2bebbb6
|
FIX #11400
|
2019-08-01 13:27:07 +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 |
|
Alexandre SPANGARO
|
a2fc3689da
|
Nowrap on amount
|
2019-07-28 22:59:43 +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
|
d0a14d5aa7
|
all http addresses should be https now
|
2019-06-23 15:41:10 +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 |
|
Eric Seigne
|
80d4d8754d
|
allow zero as accountancy code nomber (replace all empty tests by != '')
|
2019-06-17 18:28:11 +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
|
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
|
cb859b7dfb
|
Look and feel v10
|
2019-06-04 01:30:17 +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 |
|
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
|
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
|
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 |
|
Alexandre SPANGARO
|
99b068b625
|
FIX sortfield on lettering function
|
2019-05-05 21:46:56 +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 |
|
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 |
|
Alexandre SPANGARO
|
660a1cea1d
|
NEW Accounting - Add rights on export, delete operations in ledger
|
2019-04-17 07:26:39 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +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 |
|
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 |
|
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 |
|
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 |
|
Frédéric FRANCE
|
a836c75d70
|
replace html by html5 in accountancy
|
2019-03-03 10:31:46 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
gauthier
|
2142ccee8a
|
FIX : better method
|
2019-02-08 15:17:40 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +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
|
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
|
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 |
|