Laurent Destailleur
084b2411df
Merge pull request #15550 from OPEN-DSI/new-supplier-product-list-with-stock
...
NEW show stock in supplier product select list
2020-11-26 18:56:04 +01:00
Laurent Destailleur
82da0d01f1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formorder.class.php
htdocs/fourn/commande/list.php
2020-11-26 18:52:00 +01:00
Laurent Destailleur
9aa657bc35
Debug v13
2020-11-26 18:48:51 +01:00
Laurent Destailleur
b043442b91
Fix link and selection of status of purchase order.
2020-11-26 17:53:57 +01:00
Laurent Destailleur
c994b3b6f2
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2020-11-26 17:02:19 +01:00
Laurent Destailleur
22c2cfd9ec
FIX warning for purchase order delivery late.
2020-11-26 16:57:39 +01:00
Laurent Destailleur
52cc08f5da
FIX option "Show subtotal" on the balance report
2020-11-26 16:12:55 +01:00
Laurent Destailleur
3ccc9d3e57
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-26 15:29:57 +01:00
Laurent Destailleur
bd780a8c51
FIX Warning on late purchase order delivery
2020-11-26 15:29:18 +01:00
Laurent Destailleur
f231620084
Fix creation of MRP when product is a kit.
2020-11-26 14:32:40 +01:00
Laurent Destailleur
187ba94a57
Look and feel v13
2020-11-26 14:24:52 +01:00
Laurent Destailleur
3588781180
Debug v13
2020-11-26 14:15:20 +01:00
lvessiller
17e13eb821
NEW show stock in supplier product select list
2020-11-26 14:12:02 +01:00
Laurent Destailleur
5d0a54c0de
Fix var not defined
2020-11-26 12:07:01 +01:00
Laurent Destailleur
e1a6e8f2fc
CSS
...
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
c7e5b0dcc1
Fix warning
2020-11-26 10:12:24 +01:00
Laurent Destailleur
69b06a25e8
Fix code of deletion of objects
2020-11-26 09:16:16 +01:00
Laurent Destailleur
e272130a6a
Fix phpcs
2020-11-26 08:40:08 +01:00
Laurent Destailleur
22bcb08950
Update doc
2020-11-25 23:03:17 +01:00
Laurent Destailleur
8fa2005c64
Merge pull request #15545 from proprum/patch-1
...
Adding require_once files.lib to fourn/paiement.
2020-11-25 19:59:49 +01:00
Laurent Destailleur
77c8631528
Merge pull request #15544 from frederic34/patch-14
...
doxygen
2020-11-25 19:58:55 +01:00
Laurent Destailleur
c1a1d4330a
Update expensereport.class.php
2020-11-25 19:55:11 +01:00
proprum
d1cded49a9
Adding require_once files.lib to fourn/paiement.
...
Bug when there is a calculated extrafield which use "dol_dir_list" for calculating the amount of files attached to a invoice
With bonus : the integer calculated extrafield configuration :
count(dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').dol_sanitizeFileName($object->ref),'files',0,'','(\.meta|_preview.*\.png)$'));
2020-11-25 19:47:30 +01:00
Frédéric FRANCE
f333dffa4b
doxygen
2020-11-25 18:45:25 +01:00
Frédéric FRANCE
9e56253704
Update expensereport.class.php
2020-11-25 18:37:03 +01:00
Laurent Destailleur
64e9944472
Merge pull request #15542 from frederic34/patch-14
...
doxygen
2020-11-25 18:15:00 +01:00
Frédéric FRANCE
d9759c4a54
doxygen
2020-11-25 18:12:59 +01:00
Frédéric FRANCE
83f6e9dfc2
doxygen
2020-11-25 18:08:13 +01:00
Laurent Destailleur
74605cec12
Fix warning
2020-11-25 18:07:52 +01:00
Laurent Destailleur
8ee9e59173
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-25 18:04:22 +01:00
Laurent Destailleur
d8bf7b2714
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
2020-11-25 18:04:06 +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
Laurent Destailleur
ccfb7f8256
Merge pull request #15538 from frederic34/patch-8
...
remove warning
2020-11-25 17:47:11 +01:00
Laurent Destailleur
168e35a035
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-25 17:29:09 +01:00
Laurent Destailleur
16e3baeff2
FIX filter on project list
2020-11-25 17:28:53 +01:00
Frédéric FRANCE
5ff3ab528c
remove warning
2020-11-25 17:15:06 +01:00
Frédéric FRANCE
7ca1df6d46
remove warning
2020-11-25 17:12:56 +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
c9371e9eb0
Merge pull request #15512 from fappels/12_fix_transfer_expline_extrafield
...
Fix issue #15506 tansfer line extrafield order to expedition
2020-11-25 15:30:07 +01:00
Laurent Destailleur
944e2a8032
Fix delete of expense report
2020-11-25 15:29:18 +01:00
Laurent Destailleur
54913c6a75
Merge pull request #15535 from defrance/patch-162
...
fix better delete management (include extrafield too)
2020-11-25 15:11:57 +01:00
Laurent Destailleur
4d90fb22de
Fix sql syntax error
2020-11-25 15:07:26 +01:00
Francis Appels
a734e1caa7
line is order line not exp line
2020-11-25 15:06:07 +01:00
Laurent Destailleur
5030f0c587
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/opensurvey/wizard/create_survey.php
2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d
Fix delete of proposal
2020-11-25 14:15:59 +01:00
stickler-ci
9da8cf63a2
Fixing style errors.
2020-11-25 12:07:57 +00:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop
...
Fix bank transfert supplier
2020-11-25 13:06:10 +01:00
BENKE Charlene
62c361dc1a
fix better delete management (include extrafield too)
2020-11-25 13:04:26 +01:00
Laurent Destailleur
4e5e499ddd
Merge pull request #15521 from andreubisquerra/develop
...
Order receipt improvements in TakePOS
2020-11-25 13:01:57 +01:00
Laurent Destailleur
42c30584f4
Merge pull request #15522 from frederic34/patch-15
...
Update api_thirdparties.class.php
2020-11-25 12:53:36 +01:00
