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
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
bd780a8c51
FIX Warning on late purchase order delivery
2020-11-26 15:29:18 +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
stickler-ci
bbf1ade0a5
Fixing style errors.
2020-11-25 09:39:41 +00:00
Florian HENRY
4a316f06d5
fix : finish bank transfert fourn from list
2020-11-25 10:24:44 +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
Laurent Destailleur
3d2da45f84
Remove warning
2020-11-22 11:36:07 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev
...
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Francis Appels
89e101e0b6
Fix wrong value for deprecated
2020-11-21 11:38:07 +01:00
Francis Appels
064b5acff5
List supplier barcode
2020-11-20 17:16:49 +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
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
0760a268f6
Fix warning
2020-11-18 22:25:03 +01:00
Laurent Destailleur
1dd697767e
Merge branch 'develop' into 13_doc
2020-11-18 18:08:14 +01:00
Francis Appels
aade8e7adb
Add deprecated fourn_barcode incase already used external.
2020-11-18 14:58:04 +01:00
Francis Appels
22985e7b61
Revert "use barcode iso supplier_barcode"
...
This reverts commit 57705e225b .
2020-11-18 14:27:29 +01:00
Laurent Destailleur
1a21ace02d
Update fournisseur.commande.class.php
2020-11-18 12:42:33 +01:00
Francis Appels
57705e225b
use barcode iso supplier_barcode
2020-11-16 18:02:54 +01:00
Francis Appels
5af557c902
Fix supplier barcode should be same in fetch and fetch list.
...
Refactor fourn to supplier for barcode
2020-11-16 17:36:53 +01:00
Frédéric FRANCE
4ef4792469
Update fournisseur.commande.class.php
2020-11-16 13:57:59 +01:00
Frédéric FRANCE
1abef27a1a
fix delivery_date
2020-11-16 13:52:35 +01:00
Laurent Destailleur
6c42535eb2
Maxi debug v13
2020-11-16 12:20:18 +01:00
Laurent Destailleur
cbe9fec51d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/ticket/list.php
2020-11-15 17:29:19 +01:00
BlueGarm
2425cf82d3
Add Partially Received Order and Delay
...
Edit file to allow following order received partially and to upgrade lisibility of delayed orders
2020-11-14 13:25:02 +01:00
Laurent Destailleur
90884d8085
Fix compatibility with date_delivery
2020-11-11 18:08:40 +01:00
Laurent Destailleur
dada0e16f5
Fix group by
2020-11-11 01:25:04 +01:00
jcp
d73e6a4670
Update fourn list to see cond_reglement
2020-11-10 19:37:08 +01:00
Laurent Destailleur
47b3b30aaa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
ac6f8e4e7c
Debug v13
2020-11-06 11:52:48 +01:00
Laurent Destailleur
5b737d77c2
Merge pull request #15292 from prietojc/12.0_patch-2
...
NEW: Add select by supplier category
2020-11-05 19:29:30 +01:00
Laurent Destailleur
4689d42afd
FIX #15303
2020-11-05 14:10:46 +01:00
Rüdiger Hahn
f173c0f82a
Fix: Keep status filter when using pager
...
"search_status" was correctly set before and overwritten/cleared in this line.
2020-11-04 18:54:48 +01:00
jcp
95a156301b
NEW: Add select by supplier category
2020-11-04 12:13:04 +01:00
jcp
518a225f7b
NEW massaction for BankTransfer
2020-11-03 20:53:26 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +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
21a933f15c
fix undefined variable
2020-10-31 09:37:56 +01:00
Frédéric FRANCE
8190711342
doxygen
2020-10-30 18:01:01 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Florian HENRY
d77a0b40a8
tested and approuve feaure #15036
2020-10-28 16:37:41 +01:00
Florian HENRY
a3073be8e4
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-28 08:52:29 +01:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
...
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36
Fix scrutinizer
2020-10-27 18:55:55 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
87f65d2487
Merge pull request #15156 from frederic34/patch-11
...
set unknown variables
2020-10-26 19:22:43 +01:00