Frédéric FRANCE
|
5820758968
|
fix class name Tva
|
2021-01-23 20:59:23 +01:00 |
|
Gauthier PC portable 024
|
998aa8f943
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 13:40:13 +01:00 |
|
Gauthier PC portable 024
|
ae6e1db652
|
FIX : getNomUrl()
|
2021-01-19 13:32:08 +01:00 |
|
Gauthier PC portable 024
|
e2abbbcece
|
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
|
2021-01-19 08:57:24 +01:00 |
|
Gauthier PC portable 024
|
2cfaf5fbd6
|
NEW : add real payments on vat objects
|
2021-01-18 17:08:17 +01:00 |
|
Laurent Destailleur
|
4d42fa2a37
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formaccounting.class.php
|
2021-01-17 11:34:19 +01:00 |
|
Laurent Destailleur
|
314cc45c81
|
Fix message
|
2021-01-17 11:24:24 +01:00 |
|
Florian HENRY
|
d856b0149d
|
Merge branch '13_backport' into develop
|
2021-01-12 10:08:12 +01:00 |
|
Laurent Destailleur
|
d2c86578fa
|
Update card.php
|
2021-01-11 15:58:20 +01:00 |
|
Alexandre SPANGARO
|
004ee952d9
|
Various payment - Add Amount & Sens in clone mode
|
2021-01-10 08:16:19 +01:00 |
|
Laurent Destailleur
|
b553dbb9d2
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-06 20:23:07 +01:00 |
|
Adrien Raze
|
6f05ba4db9
|
NEW : Added of doActions hooks in bank/line.php and bank/transfer.php
|
2021-01-06 14:26:40 +01:00 |
|
Frédéric FRANCE
|
ff25003025
|
fix unknown variable
|
2021-01-05 08:59:46 +01:00 |
|
Laurent Destailleur
|
64b4f1079d
|
Close #15870 manually
|
2021-01-05 02:23:38 +01:00 |
|
Laurent Destailleur
|
b88ee6eff4
|
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
|
2021-01-01 21:36:15 +01:00 |
|
Laurent Destailleur
|
715d3499ff
|
Clean code
|
2021-01-01 21:06:47 +01:00 |
|
Laurent Destailleur
|
7c74a71305
|
Fix regression
|
2021-01-01 21:03:44 +01:00 |
|
Laurent Destailleur
|
71e4a672f5
|
Merge branch 'develop' into develop_patch-1
|
2021-01-01 20:52:43 +01:00 |
|
stickler-ci
|
327ec211c4
|
Fixing style errors.
|
2020-12-31 09:49:27 +00:00 |
|
jcp
|
e187e77acb
|
ICS and ICS_transfer hide if module not enabled
|
2020-12-31 10:12:03 +01:00 |
|
Laurent Destailleur
|
5a097b21e4
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/bank/various_payment/card.php
|
2020-12-30 13:21:33 +01:00 |
|
Alexandre SPANGARO
|
a336e45098
|
FIX: #15751 Miscellaneous payment type change to 0 after updating subledger
|
2020-12-30 08:11:20 +01:00 |
|
Alexandre SPANGARO
|
0e2b7d8b3c
|
Remove typo
|
2020-12-30 07:23:26 +01:00 |
|
Florian HENRY
|
1b6a4fc4ae
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
|
2020-12-24 15:00:15 +01:00 |
|
Florian HENRY
|
f03574d061
|
bank ok
|
2020-12-24 14:56:26 +01:00 |
|
Laurent Destailleur
|
88e441412c
|
CSS
|
2020-12-24 01:35:59 +01:00 |
|
Laurent Destailleur
|
4471d7d1da
|
FIX debug report expense/income
|
2020-12-23 22:18:38 +01:00 |
|
Laurent Destailleur
|
d65dc85a10
|
FIX for php 8
|
2020-12-23 19:16:25 +01:00 |
|
Laurent Destailleur
|
58b4de8bc3
|
More complete fix for #15712
|
2020-12-21 19:27:42 +01:00 |
|
Laurent Destailleur
|
c6f83aaed7
|
Fix warning
|
2020-12-16 11:21:48 +01:00 |
|
Frédéric FRANCE
|
870f2073ad
|
fix warning
|
2020-12-11 22:13:30 +01:00 |
|
Laurent Destailleur
|
be163c684f
|
Fix phpcs
|
2020-12-10 12:54:13 +01:00 |
|
Laurent Destailleur
|
dac0267a38
|
Fix debug various payment module.
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
|
2020-12-09 21:51:01 +01:00 |
|
Laurent Destailleur
|
5bd6d6f388
|
Look and feel v13
|
2020-12-03 14:34:15 +01:00 |
|
lmarcouiller
|
8a86593b13
|
Fix a bug in bank's graph with option and mode
|
2020-12-02 16:24:01 +01: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 |
|
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 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Laurent Destailleur
|
7195760ade
|
Restore lost param
|
2020-11-18 18:20:40 +01:00 |
|
Laurent Destailleur
|
1708874306
|
Merge branch 'develop' into develop
|
2020-11-18 18:16:29 +01:00 |
|
Laurent Destailleur
|
928330c44b
|
Fix link to reconciliation page
|
2020-11-16 12:42:59 +01:00 |
|
lmarcouiller
|
304e4ac8e6
|
FIX : #15373 Reset invalid email script
|
2020-11-13 11:07:35 +01:00 |
|
lmarcouiller
|
a1f26f2b55
|
FIX :15373 Reset invalid email script
|
2020-11-13 11:03:49 +01:00 |
|
lmarcouiller
|
0e5b18a1e9
|
FIX : #14713 bank graph show all accounts
|
2020-11-13 10:05:28 +01:00 |
|
jcp
|
10ae18fe44
|
Update SQL migration
|
2020-11-12 19:42:20 +01:00 |
|
JC Prieto
|
615342aa77
|
Update account.class.php
Doc on ics_transfer var
|
2020-11-12 10:32:52 +01:00 |
|
jcp
|
7e3ef08b25
|
ICS update
|
2020-11-10 19:17:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
f6e3f58fcb
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-11-09 14:18:56 +00:00 |
|
jcp
|
50d530733e
|
NEW: ICS fields moved into bank account table
|
2020-11-09 14:08:34 +01:00 |
|
Laurent Destailleur
|
da6c6c9e0a
|
Clean code
|
2020-11-08 14:39:20 +01:00 |
|
Laurent Destailleur
|
215ecafb32
|
Look adn feel v13
|
2020-11-07 15:54:58 +01:00 |
|
Frédéric FRANCE
|
3f164f1a9b
|
doxygen
|
2020-11-05 20:13:13 +01:00 |
|
Frédéric FRANCE
|
d80f614e20
|
doxygen
|
2020-11-03 20:43:42 +01:00 |
|
Laurent Destailleur
|
b0e2d40533
|
Debug and fix v13
|
2020-11-03 14:19:54 +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 |
|
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 |
|
Frédéric FRANCE
|
8190711342
|
doxygen
|
2020-10-30 18:01:01 +01:00 |
|
Laurent Destailleur
|
c187b41714
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-29 13:10:39 +01:00 |
|
Laurent Destailleur
|
ee4a827627
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/list.php
htdocs/core/db/DoliDB.class.php
|
2020-10-29 13:10:10 +01:00 |
|
Laurent Destailleur
|
2a386b6fea
|
Fix set subledger account
|
2020-10-29 11:13:18 +01:00 |
|
Laurent Destailleur
|
91cf5de54d
|
Fix bad sort order
|
2020-10-29 11:06:18 +01:00 |
|
Laurent Destailleur
|
b1b7a7c725
|
Fix missing transaction
|
2020-10-29 10:40:50 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
6fa174d13f
|
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
11878 - select the only bank account
|
2020-10-25 14:56:08 +01:00 |
|
Laurent De Coninck
|
1d62834b2c
|
use the second version for default bank account
|
2020-10-24 17:15:48 +02:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
409f8f9866
|
Update doc
|
2020-10-21 19:50:40 +02:00 |
|
Laurent De Coninck
|
d2e2cad028
|
select by default, remove the show empty everywhere the field is required
|
2020-10-17 21:15:52 +02:00 |
|
Laurent Destailleur
|
7504f92a41
|
Standardize code and look and feel
|
2020-10-16 13:30:20 +02:00 |
|
Laurent Destailleur
|
e24ec99c8f
|
Fix regression
|
2020-10-09 11:51:34 +02:00 |
|
Laurent Destailleur
|
4eaf2c0350
|
Fix regression
|
2020-10-09 11:49:45 +02:00 |
|
Laurent Destailleur
|
b6fc33c454
|
Fix avoid error when we sumbit form to change page on conciliation
|
2020-10-09 11:13:02 +02:00 |
|
Laurent Destailleur
|
5ac7d4dbac
|
Show last 12 bank receipts instead of 15
|
2020-10-09 10:02:13 +02:00 |
|
Laurent Destailleur
|
213cefb570
|
Merge pull request #14941 from aspangaro/13a22
WIP NEW Add clone functionality on miscellaneous payment
|
2020-10-07 15:31:09 +02:00 |
|
Scrutinizer Auto-Fixer
|
1512521d91
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-07 13:01:28 +00:00 |
|
Alexandre SPANGARO
|
973502bb1e
|
Fix
|
2020-10-07 09:36:29 +02:00 |
|
Alexandre SPANGARO
|
503f190fd4
|
Fix
|
2020-10-06 14:39:10 +02:00 |
|
Laurent Destailleur
|
e3542c6d4f
|
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
NEW Show category filter on lists only when user have rights to read categories
|
2020-10-06 12:29:10 +02:00 |
|
Alexandre SPANGARO
|
050a4770d3
|
WIP NEW Add clone functionality on miscellaneous payment
|
2020-10-06 10:04:15 +02:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Laurent Destailleur
|
babcc3bc91
|
Update line.php
|
2020-09-29 16:39:47 +02:00 |
|
bahfir abbes
|
9662c4110a
|
new:bankline_prepare_head for bank lines
|
2020-09-29 01:28:39 +01:00 |
|
Sekan, Tobias
|
2bf15b3a92
|
Show category filter only on rights to read it
|
2020-09-28 10:42:49 +02:00 |
|
Tobias Sekan
|
a72519f353
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-23 09:09:42 +02:00 |
|
Laurent Destailleur
|
6c06d2f0aa
|
Look and feel v13
|
2020-09-22 15:26:29 +02:00 |
|
Laurent Destailleur
|
b4b0d682b8
|
css
|
2020-09-20 20:35:22 +02:00 |
|
Laurent Destailleur
|
e5cca13ea0
|
Fix escaping
|
2020-09-20 03:32:43 +02:00 |
|
Laurent Destailleur
|
216b3c885d
|
Fix escaping
|
2020-09-20 01:30:36 +02:00 |
|
Laurent Destailleur
|
4e2aff2cdc
|
Fix sql injection when forging requests with IN
|
2020-09-18 17:28:02 +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
|
eac9e54e0b
|
fix more different button visibility
|
2020-09-18 11:48:53 +02:00 |
|
Sekan, Tobias
|
ae8c302c19
|
merge variable declaration
|
2020-09-18 10:52:17 +02:00 |
|
Sekan, Tobias
|
dc4250aed7
|
Make button visiblity identical on most lists
|
2020-09-18 10:46:23 +02:00 |
|
Sekan, Tobias
|
1b04ef8aad
|
Add function to all list that support $socid
|
2020-09-18 10:36:40 +02:00 |
|
Laurent Destailleur
|
c4b5f5a249
|
Maxi clean of code
|
2020-09-18 01:29:17 +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
|
cc24e9b155
|
Look and feel v13
|
2020-09-15 13:27:48 +02:00 |
|
Scrutinizer Auto-Fixer
|
73915d51c8
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-14 02:30:04 +00:00 |
|
Laurent Destailleur
|
22edd650d3
|
Fix phpcs
|
2020-09-14 04:24:35 +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
|
5c776ccf3f
|
Merge pull request #14708 from TobiasSekan/AddGlobalMiscPaymentSearch
NEW Add global search for miscellaneous payments
|
2020-09-12 01:13:26 +02:00 |
|
Laurent Destailleur
|
c4383747a1
|
Look and feel v13
|
2020-09-11 13:57:16 +02:00 |
|
Sekan, Tobias
|
25d6af2b86
|
Add global search for misc payments +TODO
|
2020-09-11 09:55:34 +02:00 |
|
Laurent Destailleur
|
358f8357f9
|
FIX #14703
|
2020-09-10 18:25:38 +02:00 |
|
Sekan, Tobias
|
849a5ed865
|
Merge branch 'SelectableColumnsOnExtraPayments' of https://github.com/TobiasSekan/dolibarr into SelectableColumnsOnExtraPayments
|
2020-09-09 13:27:47 +02:00 |
|
Sekan, Tobias
|
8fa001d98d
|
Fix to short summary line
|
2020-09-09 13:27:41 +02:00 |
|
stickler-ci
|
32d77cc143
|
Fixing style errors.
|
2020-09-09 09:46:46 +00:00 |
|
Sekan, Tobias
|
870443a099
|
Add selectable columns for extra payments
|
2020-09-09 11:34:47 +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
|
8b4e153f81
|
Doc
|
2020-08-05 20:05:59 +02:00 |
|
Laurent Destailleur
|
0d24b979c1
|
Fix phpcs
|
2020-07-11 01:20:20 +02:00 |
|
Laurent Destailleur
|
a059154fdf
|
FIX reposition
|
2020-07-10 13:59:54 +02:00 |
|
Laurent Destailleur
|
f92f279527
|
FIX Navigation from bank receipts
|
2020-07-10 13:56:54 +02:00 |
|
Laurent Destailleur
|
db6ed7a646
|
FIX Navigation from bank receipts
|
2020-07-10 13:40:33 +02:00 |
|
Laurent Destailleur
|
5ea47f3ade
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
|
2020-07-08 18:11:58 +02:00 |
|
Laurent Destailleur
|
9b1163cfb8
|
Fix menu organisation.
|
2020-07-06 11:52:28 +02:00 |
|
Laurent Destailleur
|
90d4458aab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2020-06-27 00:38:51 +02:00 |
|
Laurent Destailleur
|
02e022ebfa
|
Fix class not found for supplier credit. Class must be into
commoninvoice
|
2020-06-24 19:59:06 +02:00 |
|
Laurent Destailleur
|
ff9312c96a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
|
2020-06-08 20:36:54 +02:00 |
|
Laurent Destailleur
|
c386f4b2e3
|
Maxi debug of direct debit order
|
2020-06-08 11:43:20 +02:00 |
|
Laurent Destailleur
|
7d3039d41f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
|
2020-06-06 23:04:55 +02:00 |
|
Laurent Destailleur
|
19405d5f5b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/langs/en_US/admin.lang
|
2020-06-06 23:02:05 +02:00 |
|
Laurent Destailleur
|
cbafbe16a2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
|
2020-06-06 23:00:24 +02:00 |
|
Florian Mortgat
|
c393f8149c
|
FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date
|
2020-06-04 11:29:51 +02:00 |
|
Laurent Destailleur
|
f66555b396
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-27 23:38:46 +02:00 |
|
Laurent Destailleur
|
6881610892
|
Doxygen
|
2020-05-27 23:23:01 +02:00 |
|
Frédéric FRANCE
|
e5402988d9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-24 17:58:18 +02:00 |
|
Laurent Destailleur
|
6056ed2755
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-24 01:02:08 +02:00 |
|
Frédéric FRANCE
|
5c78eca68a
|
prepare new rule
|
2020-05-23 21:14:44 +02:00 |
|
Frédéric FRANCE
|
174ddc5fd4
|
prepare new rule
|
2020-05-23 21:07:47 +02:00 |
|
Laurent Destailleur
|
7bfbf3c88b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/index.php
|
2020-05-23 20:20:53 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
f5688b2eec
|
add new rule
|
2020-05-21 01:52:25 +02:00 |
|
gauthier
|
f3582d891a
|
FIX : We must only rename current bank receipt
|
2020-05-19 15:35:37 +02:00 |
|
Laurent Destailleur
|
af46108cc4
|
Look and feel v12
|
2020-05-17 13:34:16 +02:00 |
|
Laurent Destailleur
|
b5f3be4599
|
Clean phpcs rule file
|
2020-05-13 00:29:46 +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 |
|
Maxime Kohlhaas
|
1a9afe6b20
|
Fix missing hook params for printFieldListValue
|
2020-05-08 01:40:25 +02:00 |
|
kamel
|
db591cdcd8
|
FIX: show value of the extrafields in the bank list
|
2020-05-05 14:47:31 +02:00 |
|
Laurent Destailleur
|
f8dfe886ac
|
Fix css
|
2020-04-28 20:52:24 +02:00 |
|
Laurent Destailleur
|
731864eb4a
|
Removed useless translation keys
|
2020-04-25 12:43:41 +02:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
Frédéric FRANCE
|
4605b9ec61
|
Update api_bankaccounts.class.php
|
2020-04-22 19:16:58 +02:00 |
|
Laurent Destailleur
|
cadb52c5b3
|
Look and feel v12
|
2020-04-20 19:39:34 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Laurent Destailleur
|
98f370034a
|
Look and feel v12
|
2020-04-20 14:53:17 +02:00 |
|
Laurent Destailleur
|
b90217d860
|
Merge pull request #13655 from frederic34/patch-4
fix indent
|
2020-04-20 14:38:17 +02:00 |
|
Laurent Destailleur
|
78474af486
|
Link missing
|
2020-04-20 03:14:44 +02:00 |
|
Frédéric FRANCE
|
61e76ef25e
|
Update api_bankaccounts.class.php
|
2020-04-19 21:47:30 +02:00 |
|
Laurent Destailleur
|
018cfdf54b
|
FIX Field balance before and after sometimes not visible in bank entries
|
2020-04-18 16:14:37 +02:00 |
|
Laurent Destailleur
|
de74c447cc
|
Fix sanitize amount
|
2020-04-18 16:05:26 +02:00 |
|
Laurent Destailleur
|
b0515c626b
|
Look and feel v12
|
2020-04-18 00:09:24 +02:00 |
|
Laurent Destailleur
|
ee26390f89
|
Look and feel v12
|
2020-04-17 19:15:22 +02:00 |
|
Laurent Destailleur
|
5254a94038
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
|
2020-04-16 15:58:59 +02:00 |
|
ptibogxiv
|
284f269213
|
Update api_bankaccounts.class.php
|
2020-04-15 19:32:45 +02:00 |
|
atm-quentin
|
f7c07640dd
|
viewstatut to search_status
|
2020-04-15 15:01:00 +02:00 |
|
Laurent Destailleur
|
a72b262f5b
|
FIx #13592
Conflicts:
htdocs/compta/bank/line.php
|
2020-04-13 14:52:06 +02:00 |
|
Laurent Destailleur
|
4ab3bf99ec
|
FIx #13592
|
2020-04-13 14:50:55 +02:00 |
|
Scrutinizer Auto-Fixer
|
387ea73bf3
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-13 11:24:42 +00:00 |
|
Laurent Destailleur
|
92b6b1a042
|
Look and feel v12
|
2020-04-12 18:13:43 +02:00 |
|
Laurent Destailleur
|
422e33a68b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
|
2020-04-12 17:01:44 +02:00 |
|
Laurent Destailleur
|
2e27355dec
|
FIX #13569
|
2020-04-12 16:51:35 +02:00 |
|
Laurent Destailleur
|
760121a3d1
|
Can sort list of answers.
|
2020-04-11 14:13:16 +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
|
6a60678186
|
Look and feel v12
|
2020-04-09 16:36:39 +02:00 |
|
Laurent Destailleur
|
03b09f1d28
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-04-05 12:14:03 +02:00 |
|
Laurent Destailleur
|
13b47774e2
|
FIX #13424
|
2020-04-05 11:55:43 +02:00 |
|
Laurent Destailleur
|
b8c2dd6025
|
Look and feel v12
|
2020-04-02 15:11:46 +02:00 |
|
Laurent Destailleur
|
8bab245c7e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
|
2020-03-18 18:50:55 +01:00 |
|
Laurent Destailleur
|
c1931a045e
|
Merge pull request #13376 from fmarcet/11.0
FIX: Bank movements color is not showing
|
2020-03-18 18:22:46 +01:00 |
|
Ferran Marcet
|
1fe4e4415e
|
FIX: Bank movements color is not showing
|
2020-03-18 09:27:08 +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 |
|
Tobias Sekan
|
9dd362a22c
|
NEW Category filter on bank list
|
2020-03-09 11:43:15 +01:00 |
|
Laurent Destailleur
|
aa1552dbc0
|
Enhance graphs
|
2020-03-05 00:17:16 +01:00 |
|
Laurent Destailleur
|
f5a07dfb7e
|
Add status into popup
|
2020-02-28 18:57:17 +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
|
6366881f91
|
FIX #13175
|
2020-02-24 00:41:25 +01:00 |
|
Laurent Destailleur
|
189c0d675b
|
Fix memory report. Xdebug no more required. Try = null instead of unset.
|
2020-02-23 22:05:59 +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
|
44eda2d4ad
|
Fix doxygen
|
2020-02-20 13:42:43 +01:00 |
|
Laurent Destailleur
|
895503d2eb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
|
2020-02-20 00:21:25 +01:00 |
|
Laurent Destailleur
|
3fafbb372b
|
Remove call of $mc->dao than hangs. Replaced with $mc use.
|
2020-02-19 15:51:27 +01:00 |
|
Laurent Destailleur
|
4f3cc87077
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:38 +01:00 |
|
Laurent Destailleur
|
30fa8940a9
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:00 +01:00 |
|
Laurent Destailleur
|
f3e27695e2
|
FIX Avoid deletion of bank record if in accounting
|
2020-02-05 16:35:50 +01:00 |
|
Laurent Destailleur
|
44ed5980f5
|
FIX Avoid deletion of bank record if in accounting
|
2020-02-05 16:35:09 +01:00 |
|
Laurent Destailleur
|
7b10c2440b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-29 23:08:42 +01:00 |
|
Michael Jeanmotte
|
f1f83656f1
|
Feature Request: Dolibarr API - [GET] /bankaccounts/{id}/lines : add sqlfilters #11259
|
2020-01-29 22:54:35 +01:00 |
|
Laurent Destailleur
|
92856788a3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-20 18:39:46 +01:00 |
|
Laurent Destailleur
|
b8938b8d19
|
Fix look and feel v11
|
2020-01-20 02:18:00 +01:00 |
|
Laurent Destailleur
|
7c5485288b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-19 20:34:20 +01:00 |
|
Laurent Destailleur
|
62b9fbb67f
|
Fix link
|
2020-01-19 20:33:55 +01:00 |
|
Laurent Destailleur
|
6b6c9efe5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-19 19:56:21 +01:00 |
|
Laurent Destailleur
|
99f679493b
|
Fix search
|
2020-01-19 19:51:40 +01:00 |
|
Laurent Destailleur
|
526ae83e8f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-19 19:49:16 +01:00 |
|
Laurent Destailleur
|
e679e05f57
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-19 19:49:04 +01:00 |
|
Laurent Destailleur
|
19ab802aaf
|
Fix disabling of balance
|
2020-01-19 19:48:19 +01:00 |
|
Laurent Destailleur
|
d6bdbccf4f
|
Fix link
|
2020-01-19 19:33:57 +01:00 |
|
Laurent Destailleur
|
178dd518cf
|
Merge branch 'develop' into scrutinizer-patch-5
|
2020-01-18 19:36:36 +01:00 |
|
Scrutinizer Auto-Fixer
|
8744f6ab7b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-18 15:17:07 +00:00 |
|
Laurent Destailleur
|
73d56358e1
|
Fix bad param
|
2020-01-18 16:13:10 +01:00 |
|
Laurent Destailleur
|
4e4a810484
|
Merge pull request #12368 from aspangaro/11.0_a5
NEW Various payment list - Add search date start & date end & subledger account
|
2020-01-15 17:51:59 +01:00 |
|
Laurent Destailleur
|
3f79c00542
|
Merge branch 'develop' into actioncomm_category
|
2020-01-15 14:21:06 +01:00 |
|
Laurent Destailleur
|
9ebdd82edb
|
Fix We must refuse to delete a various payment if payment was dispatched
in accountancy.
|
2020-01-10 02:43:24 +01:00 |
|
Laurent Destailleur
|
675ce3b32f
|
Fix sql error on update of subledger account on a various payment
Fix warning message that was not accurate
|
2020-01-10 02:20:08 +01:00 |
|
Laurent Destailleur
|
38de69f5a9
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
|
2020-01-04 14:20:25 +01:00 |
|
Alexandre SPANGARO
|
f14aaf5e50
|
FIX Some problems on conciliation with others modules
|
2020-01-03 16:35:02 +01:00 |
|
Frédéric FRANCE
|
90235d0528
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-31 13:57:40 +01:00 |
|
Laurent Destailleur
|
8202a67e4e
|
Fix look and feel v11
|
2019-12-25 23:15:56 +01:00 |
|
Alexandre SPANGARO
|
ab0f77b467
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
|
2019-12-23 21:15:17 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
9685b56375
|
Fix warning
|
2019-12-15 15:03:22 +01:00 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Laurent Destailleur
|
8fbaae3fef
|
Merge pull request #12694 from frederic34/patch-8
doxygen
|
2019-12-14 13:43:47 +01:00 |
|
Frédéric FRANCE
|
57055bad03
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-13 14:36:00 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Frédéric FRANCE
|
9357bfd98e
|
doxygen
|
2019-12-12 08:17:14 +01:00 |
|
Frédéric FRANCE
|
269e53583d
|
doxygen
|
2019-12-11 23:46:12 +01:00 |
|
Laurent Destailleur
|
5454380834
|
CSS
|
2019-12-11 19:14:41 +01:00 |
|
Scrutinizer Auto-Fixer
|
4debd71281
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-06 08:26:49 +00:00 |
|
Frédéric FRANCE
|
d9bfa62367
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-05 21:47:42 +01:00 |
|
Laurent Destailleur
|
5f148be56f
|
Fix responsive
|
2019-12-04 16:43:56 +01:00 |
|
Frédéric FRANCE
|
4c5c6b6ff1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-03 17:56:43 +01:00 |
|
Scrutinizer Auto-Fixer
|
36a74cd160
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-03 10:17:29 +00:00 |
|
Frédéric FRANCE
|
25ed2b930f
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-01 16:10:37 +01:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
5f99e25c45
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-28 11:36:20 +00:00 |
|
Frédéric FRANCE
|
b2912e688b
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-27 22:54:05 +01:00 |
|
Alexandre SPANGARO
|
0f6de0049c
|
Fix
|
2019-11-26 21:17:22 +01:00 |
|
Alexandre SPANGARO
|
d910b05a38
|
Look & Feel v11
|
2019-11-26 20:28:24 +01:00 |
|
Frédéric FRANCE
|
4c4ae5b6e1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-26 08:10:40 +01:00 |
|
Frédéric FRANCE
|
f3f308fc1b
|
Update graph.php
|
2019-11-26 00:11:02 +01:00 |
|
Laurent Destailleur
|
f9092b1b8e
|
Fix responsive
|
2019-11-20 13:22:40 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Alexandre SPANGARO
|
1e2fd1f25a
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
|
2019-11-17 21:55:25 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Frédéric FRANCE
|
6784ea9fae
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-16 09:21:57 +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 |
|
Frédéric FRANCE
|
a3e092b227
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-14 09:21:26 +01: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 |
|
Frédéric FRANCE
|
446c66da62
|
use class CONST
|
2019-11-14 08:15:39 +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
|
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 |
|
Scrutinizer Auto-Fixer
|
df664e790b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 23:15:34 +00: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
|
4fce0d3e7a
|
Fix not transversable
|
2019-11-08 15:52:57 +01:00 |
|
Scrutinizer Auto-Fixer
|
2ecfe41810
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 09:53:31 +00:00 |
|
Laurent Destailleur
|
c0b8684475
|
Merge pull request #12341 from inoveaconseil/bankStatementDocument
NEW add upload for account statement
|
2019-11-07 15:06:47 +01:00 |
|
Laurent Destailleur
|
5a4a421a8e
|
FIX #12372
|
2019-11-07 13:07:40 +01:00 |
|
Alexandre SPANGARO
|
b85dc0c5e5
|
NEW Various payment list - Add search date start & date end & subledger_account
|
2019-11-07 09:19:48 +01:00 |
|
Nicolas
|
f18bca7687
|
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
|
2019-11-06 20:51:17 +01:00 |
|
Nicolas
|
4143988614
|
NEW Add upload document on account statement
|
2019-11-06 20:50:02 +01:00 |
|
Inovea Conseil
|
fed6ed8760
|
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
|
2019-11-06 20:48:24 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
stickler-ci
|
f537ae60b6
|
Fixing style errors.
|
2019-11-05 12:52:58 +00:00 |
|
Nicolas
|
991e1b2747
|
NEW Add upload document on account statement
|
2019-11-05 13:51:52 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Laurent Destailleur
|
ec8bd6327d
|
Fix css
|
2019-11-04 18:53:46 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01:00 |
|
Laurent Destailleur
|
89f1904793
|
Finish removing of ->attribute_label
|
2019-11-02 17:26:26 +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
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +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 |
|
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
|
a1f0245c79
|
clean indent in compta, contact directory
|
2019-10-26 18:13:20 +02:00 |
|
Frédéric FRANCE
|
79825e2193
|
start clean indent in compta directory
|
2019-10-26 14:42:25 +02:00 |
|
Laurent Destailleur
|
b4eb14ee44
|
Use dolGetStatus
|
2019-10-24 16:43:23 +02:00 |
|
Laurent Destailleur
|
9a386da7f5
|
NEW Can crop/resize image attached on a bank record
|
2019-10-23 16:07:09 +02:00 |
|
Laurent Destailleur
|
31ad147e0e
|
Look and feel v11
|
2019-10-23 15:17:01 +02:00 |
|
Laurent Destailleur
|
02f559db5f
|
Use GETPOST
|
2019-10-23 15:07:21 +02:00 |
|
Laurent Destailleur
|
564f96c092
|
Fix scrutinizer warnings
|
2019-10-23 14:59:02 +02:00 |
|
Laurent Destailleur
|
b88968520b
|
Move code of extrafields to the new architecture
|
2019-10-22 17:08:37 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
e07e01580d
|
Replace deprecated code with new one
|
2019-10-16 03:34:32 +02:00 |
|
Laurent Destailleur
|
ebd8bc3645
|
Merge pull request #12107 from frederic34/patch-14
Update list.php
|
2019-10-14 20:57:01 +02:00 |
|
Frédéric FRANCE
|
b424fc6e27
|
Update list.php
|
2019-10-12 18:57:08 +02:00 |
|
Frédéric FRANCE
|
cef935468d
|
Update list.php
|
2019-10-12 18:40:39 +02:00 |
|
Laurent Destailleur
|
bcc41c2a33
|
NEW Can filter on description on bank account transaction lists.
|
2019-10-12 13:19:10 +02:00 |
|
Laurent Destailleur
|
5970ea5b79
|
Update releve.php
|
2019-10-08 15:48:29 +02:00 |
|
Laurent Destailleur
|
d6bf0fa483
|
Update releve.php
|
2019-10-08 15:47:47 +02:00 |
|
fuhraih
|
368b34c5c2
|
FIX #11835
FIX #11835 edit Bank Statements in second Page and so on not working
|
2019-10-08 15:34:35 +02:00 |
|
Laurent Destailleur
|
43a70e5548
|
Clean code to use the new $extrafields->attributes array
|
2019-10-08 09:28:50 +02:00 |
|
Laurent Destailleur
|
c2a7ae23bc
|
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
|
2019-10-07 13:03:27 +02:00 |
|
Laurent Destailleur
|
52c06c1815
|
Fix css
|
2019-10-06 19:28:08 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Alexandre SPANGARO
|
14381927c7
|
Fix Bank Fa-icon
|
2019-10-03 20:32:15 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
41a2a25729
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/ligne.php
|
2019-09-17 12:23:58 +02:00 |
|
Laurent Destailleur
|
5233e7d8ad
|
FIX do not output return code on screen after a select of bank account
|
2019-09-16 18:29:04 +02:00 |
|
Laurent Destailleur
|
6bfba0b731
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
|
2019-09-15 15:17:38 +02:00 |
|
Alexandre SPANGARO
|
21e27389d4
|
NEW Bank Add an option for colorize background color of debit or credit movement
|
2019-09-14 20:58:12 +02:00 |
|
Alexandre SPANGARO
|
4420af683d
|
Fix Bank entries - nowrap on amount
|
2019-09-14 05:44:28 +02:00 |
|
Laurent Destailleur
|
481a25cb8f
|
The hook "moreFamily" must return payment into var "totalpayment" and no
more "paiement" (english replace french).
|
2019-09-03 17:39:19 +02:00 |
|
Laurent Destailleur
|
da3d230182
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
|
2019-09-03 17:34:49 +02:00 |
|
Laurent Destailleur
|
84800257e8
|
Merge pull request #11799 from jtraulle/fix-11683-10.0
Fix #11682 Missing origin object ref and thirdparty ref in future ban…
|
2019-09-03 17:32:47 +02:00 |
|
Laurent Destailleur
|
7c07e64adc
|
Update treso.php
|
2019-09-03 17:32:18 +02:00 |
|
Laurent Destailleur
|
65fee73b22
|
Update treso.php
|
2019-09-03 17:31:20 +02:00 |
|
Jean Traullé
|
8f1fba6775
|
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries
|
2019-08-30 23:56:52 +02:00 |
|
Laurent Destailleur
|
999db7ed41
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
|
2019-08-26 16:49:25 +02:00 |
|
Alexandre SPANGARO
|
76691925a4
|
FIX Missing div for buttons in tax, loan, various payment modules
|
2019-08-26 15:35:20 +02:00 |
|
Laurent Destailleur
|
3339f89fc5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
|
2019-08-22 12:45:23 +02:00 |
|
Laurent Destailleur
|
27cd6cd308
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
|
2019-08-22 12:39:07 +02:00 |
|
Laurent Destailleur
|
a35f010e55
|
FIX name and position of hook FIX #11710
|
2019-08-22 12:30:14 +02:00 |
|
Laurent Destailleur
|
6abfd8b145
|
Fix use short labels for workboard
|
2019-08-19 10:01:42 +02:00 |
|
Laurent Destailleur
|
c989a63360
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/langs/en_US/cashdesk.lang
|
2019-08-18 20:54:06 +02:00 |
|
Laurent Destailleur
|
f27bea9497
|
Fix phpcs
|
2019-08-18 20:39:02 +02:00 |
|
Laurent Destailleur
|
ad5f2dbe9d
|
Fix update on id
|
2019-08-18 18:56:58 +02:00 |
|
Laurent Destailleur
|
8cf0671804
|
FIX Missing transaction
|
2019-08-18 18:56:21 +02:00 |
|
Jean Traullé
|
e0310b5d9b
|
Fix #11682 Missing origin object ref and thirdparty ref in future bank entries
|
2019-08-16 11:38:42 +02:00 |
|
Jean Traullé
|
6edf5494c3
|
Added @throws annotations for possible exceptions
|
2019-08-15 15:29:37 +02:00 |
|
Jean Traullé
|
f37b8c78c8
|
NEW Add POST /bankaccounts/transfer REST API endpoint.
This allow internal transfers between two bankaccounts.
|
2019-08-15 15:18:09 +02:00 |
|
Frédéric FRANCE
|
aa462bac23
|
Add empty index.html
|
2019-08-09 09:25:48 +02:00 |
|
Laurent Destailleur
|
4833c2bf49
|
Merge
|
2019-07-22 18:50:17 +02:00 |
|
Alexandre SPANGARO
|
5f042cf6ad
|
QUAL Move ligne.php to line.php
|
2019-07-19 23:19:06 +02:00 |
|
Alexandre SPANGARO
|
9ab0734415
|
NEW Extrafields on salaries
|
2019-07-19 23:08:24 +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
|
675b7b2e32
|
Fix link to reconcile
|
2019-07-05 13:11:30 +02:00 |
|
Laurent Destailleur
|
575dce2dff
|
Fix css
|
2019-07-05 12:17:36 +02:00 |
|
Laurent Destailleur
|
5675e7c50e
|
Clean code of deprecated method
|
2019-06-22 18:19:40 +02:00 |
|
Laurent Destailleur
|
d47cf87c00
|
Look and feel v10
|
2019-06-20 17:59:28 +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
|
e060af5c97
|
Update treso.php
|
2019-06-20 02:50:23 +02:00 |
|
Alexandre SPANGARO
|
a849fbe42e
|
Nowrap on amount
|
2019-06-19 07:15:52 +02:00 |
|
Laurent Destailleur
|
475f59cc2a
|
Update annuel.php
|
2019-06-12 13:10:17 +02:00 |
|
Laurent Destailleur
|
9d95812495
|
Update bankentries_list.php
|
2019-06-12 13:08:26 +02:00 |
|
Alexandre SPANGARO
|
6d43efb4a2
|
Align right
|
2019-06-09 16:35:45 +02:00 |
|
Alexandre SPANGARO
|
8c5a01dd90
|
Show total with decimals
|
2019-06-09 08:56:49 +02:00 |
|
Alexandre SPANGARO
|
33b02b97d5
|
Better look
|
2019-06-09 08:50:20 +02:00 |
|
Laurent Destailleur
|
bc030561ac
|
Debug various payment
|
2019-05-29 13:48:00 +02:00 |
|
Laurent Destailleur
|
280a034199
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-05-29 13:15:57 +02:00 |
|
Laurent Destailleur
|
a7dccf1617
|
Merge pull request #11255 from aspangaro/10.0_accountancy2
FIX Lost functionnality - Add category to bank transaction with various payment
|
2019-05-29 13:15:47 +02:00 |
|
Laurent Destailleur
|
cafb3840b7
|
Fix look and feel v10
|
2019-05-29 12:56:11 +02:00 |
|
Laurent Destailleur
|
6a84dfe29e
|
Update card.php
|
2019-05-29 12:34:54 +02:00 |
|
Alexandre SPANGARO
|
19b275f2d1
|
Fix bankline cat with various payment
|
2019-05-26 22:33:35 +02:00 |
|
Laurent Destailleur
|
b81c3a6d2b
|
Fix look and feel v10
|
2019-05-26 18:23:30 +02:00 |
|
Alexandre SPANGARO
|
ea13657617
|
Merge remote-tracking branch 'upstream/develop' into 10.0_accountancy2
|
2019-05-26 14:23:47 +02:00 |
|