Laurent Destailleur
9eb45c500f
Merge pull request #14988 from aspangaro/13a24
...
FIX Show accounting account in supplier invoice when line is binded
2020-10-12 13:06:34 +02:00
Florian HENRY
0b9783b7ed
fix #14946
2020-10-12 11:31:09 +02:00
Florian HENRY
1f6a99e361
Merge github.com:Dolibarr/dolibarr into dev_finish_packingfeature
2020-10-12 11:11:23 +02:00
Florian HENRY
df4b208de1
fix: add missing edit field with pakaging option on
2020-10-12 11:10:49 +02:00
Alexandre SPANGARO
dd7415c937
Revert dol_fiche_head
2020-10-12 11:00:04 +02:00
Alexandre SPANGARO
873cf24641
FIX Show accounting account in supplier invoice when line is binded
2020-10-12 10:39:37 +02:00
Alexandre SPANGARO
8876457b54
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-10 06:47:05 +02:00
Laurent Destailleur
5b4c32ff84
Merge pull request #14930 from FHenry/develop
...
fix bad test syntax
2020-10-09 13:59:27 +02:00
Laurent Destailleur
a23a91a4b9
Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch
...
NEW: Add global search for customer payments and vendor payments
2020-10-09 13:56:52 +02:00
Florian HENRY
29bf3d0439
Merge github.com:Dolibarr/dolibarr into develop
2020-10-09 12:20:29 +02:00
Florian HENRY
bbdf304f1e
fix
2020-10-09 12:20:20 +02:00
Laurent Destailleur
fe2e41527a
Fix sql error
2020-10-09 10:28:26 +02:00
Laurent Destailleur
ec28a4fcdc
More info on tooltip
2020-10-09 10:21:07 +02:00
Sekan, Tobias
35fbc602ee
Add global payment search
2020-10-09 09:22:26 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Laurent Destailleur
e7c456f6f2
NEW Add column payment term into list of supplier invoices.
2020-10-08 19:22:21 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Laurent Destailleur
ad5641dc76
Merge pull request #14951 from TobiasSekan/SelectableColumnsOnSupplierInvoicePaymentList
...
NEW Select-able columns on supplier invoice payment list
2020-10-07 15:19:19 +02:00
Laurent Destailleur
415840e346
Merge pull request #14952 from TobiasSekan/AllowZeroQualityOnSupplierOrderLines
...
NEW Allow zero quality on supplier/vendor order line
2020-10-07 15:07:53 +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
Sekan, Tobias
3f39766064
Allow zero quality on supplier order line
2020-10-07 13:10:04 +02:00
Florian HENRY
36353f7c9b
Merge github.com:Dolibarr/dolibarr into develop
2020-10-07 12:04:18 +02:00
stickler-ci
85b7458b02
Fixing style errors.
2020-10-07 09:24:37 +00:00
Sekan, Tobias
e26ab93179
missing code remove from last commit
2020-10-07 11:22:23 +02:00
Sekan, Tobias
29ee420f3e
Selectable columns on sup. invoice payment list
2020-10-07 11:18:31 +02:00
Laurent Destailleur
e9bcd95c39
Add information column on page to export source of accounting document
2020-10-07 00:49:19 +02:00
Laurent Destailleur
663f149982
Better error management
2020-10-06 16:48:48 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +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
Laurent Destailleur
38acd83f4d
Review some titles and tooltip help to be more clear.
2020-10-06 12:17:33 +02:00
Aurélien
5571a166c6
change variable #14697
2020-10-06 11:37:55 +02:00
Florian HENRY
4e711d4e30
fix bad test syntax
2020-10-05 15:15:15 +02:00
Sébastien
6c11f7823a
Enable TPL overriding for document_actions_post_headers.tpl.php
...
Currently it is not possible to override the "document_actions_post_headers.tpl.php" template via a third party module. This addition of code adds this possibility
2020-10-05 10:16:30 +04:00
Laurent Destailleur
331f751905
Merge pull request #14866 from defrance/patch-156
...
NEW add two hooks printFieldListFrom and printFieldSearchParam
2020-10-02 15:01:12 +02:00
Laurent Destailleur
31710479dc
Update list.php
2020-10-02 14:59:18 +02:00
Laurent Destailleur
399258cc86
Update list.php
2020-10-02 14:55:02 +02:00
Laurent Destailleur
10deb1baad
Clean code - Removed no more used files orderstoinvoice.php
2020-10-02 13:51:32 +02:00
Laurent Destailleur
d912908aef
NEW Can build vendor invoice from vendor orders
2020-10-01 19:05:20 +02:00
Laurent Destailleur
58de8c9149
Close #14885 Merge manualy the PR to solve a conflict.
2020-10-01 17:04:24 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
BENKE Charlene
10f8ccd7ed
New : add two hook for more feature on list
...
New hook are :
printFieldListTable : allow to add more table on sql query (from another modules)
printFieldListSearchParam : allow to keep search on new filter
If ok, i add it on all native list
2020-09-30 10:55:55 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
1b83b55995
Fix to exclude possible sql injection
2020-09-25 17:11:54 +02:00
Laurent Destailleur
0d797a793a
On technical error, return http code 500
2020-09-25 15:01:15 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Laurent Destailleur
3e977bc5d6
Fix css
2020-09-21 12:55:06 +02:00
Laurent Destailleur
b2f8c4c6b8
Escape output
2020-09-20 19:21:04 +02:00
Laurent Destailleur
cd8ebd9500
Fix warnings
2020-09-20 16:57:53 +02:00
Laurent Destailleur
f57b4fd2fd
Fix escaping
2020-09-20 02:30:53 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
7c50cc9c72
css
2020-09-19 15:17:50 +02:00
Laurent Destailleur
3bd94d52a1
Fix css
2020-09-19 15:15:49 +02:00
Laurent Destailleur
11bf662c38
Fix regression
2020-09-18 17:49:51 +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
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
d1f70a37df
Preselect thirparty on new from list (part 1)
2020-09-18 07:56:13 +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
dec73da206
FIX #yogosha4430
2020-09-16 16:17:02 +02:00
Laurent Destailleur
e5191cad24
Move code of incoterm into the Incoterm Trait.
2020-09-16 02:50:18 +02:00
Christian Foellmann
c869f8fe5f
fix for broken table on dispatch when hiding sellby/eatby dates
2020-09-15 14:19:02 +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
970995d728
Clean code. Replace num_paiement with num_payment everywhere.
2020-09-14 01:03:51 +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
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Romain DESCHAMPS
476cb642f4
Fix ToSell/ToBuy tag in supplier products list
...
#14691
2020-09-09 19:01:45 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
ef0c9df5ff
Merge pull request #14224 from cfoellmann/disable-eatby-sellby
...
NEW Can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
2020-09-04 12:09:30 +02:00
Juanjo Menent
9bd5ed627f
Fix travis issues
2020-09-04 09:55:02 +02:00
Laurent Destailleur
457342ee95
Merge pull request #14541 from TobiasSekan/FixSinglePayWithMultiOnPaymentForun
...
FIX non-numeric value on multicurrency payment (part 2)
2020-09-03 13:26:43 +02:00
Laurent Destailleur
661e3c7a11
Merge pull request #14576 from TobiasSekan/ShowBankOnlyWhenActive
...
FIX: Show bank account only when bank module is active (on invoices)
2020-09-03 13:19:32 +02:00
Juanjo Menent
bb92e64e43
FIX : #14474 Error when deleting
2020-09-03 12:43:38 +02:00
Laurent Destailleur
0572d2e46d
Merge pull request #14385 from egils-consulting/translate-variable-name-and-add-hints
...
Update api_supplier_invoices.class.php
2020-09-02 18:22:50 +02:00
Laurent Destailleur
bf06a34139
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/fourn/facture/paiement.php
2020-08-28 21:29:35 +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
144cc52b20
Merge pull request #14540 from TobiasSekan/FixSingelPaymentWithMulticurrency
...
FIX non-numeric value on multicurrency payment (part 1)
2020-08-28 21:17:32 +02:00
Laurent Destailleur
e5398c8f2d
Update paiement.php
2020-08-28 21:16:33 +02:00
Sekan, Tobias
9c54f8831f
Show bank only when active (on new)
2020-08-28 13:08:04 +02:00
Sekan, Tobias
216e22e505
Show bank only when bank module is active
2020-08-28 12:53:30 +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
Laurent Destailleur
243f59b9e9
FIX Missing transaction on PO actions
2020-08-26 17:09:45 +02:00
Laurent Destailleur
7c39543c72
Support trigger in module recruitment
...
Enhance generic code of automatic recording events
2020-08-25 12:47:38 +02:00
Laurent Destailleur
05d82a0684
FIX Error management. Do no try to approve PO if validation fails.
2020-08-24 17:07:30 +02:00
Sekan, Tobias
6d2aa6b654
Fix non-numeric value
2020-08-24 15:26:06 +02:00
Sekan, Tobias
4c887d6110
Fix for non-numeric value in payment
2020-08-24 14:53:34 +02:00
stickler-ci
8191447007
Fixing style errors.
2020-08-19 16:33:41 +02:00
Christian Foellmann
b6af4014de
hide eatby, sellby dates
2020-08-19 16:33:41 +02:00
Laurent Destailleur
7217dc3114
Better perf for phpunit on very large databases
2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Laurent Destailleur
f758a8345e
Merge branch 'develop' into translate-variable-name-and-add-hints
2020-08-16 23:52:48 +02:00
Laurent Destailleur
f26a287d10
Update api_supplier_invoices.class.php
2020-08-16 23:50:01 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
bahfir abbes
2cdb17a110
fix: fetch reception on supplier order dispatch fetch
2020-08-07 12:08:14 +02:00