Laurent Destailleur
fead1b7e86
Merge pull request #15907 from atm-kevin/Fix_multicurrency_supplier_invoice_puht_devise
...
Fix #14353
2021-01-06 19:32:53 +01:00
kevin
e8ba4de832
Fix #14353
2021-01-06 14:46:56 +01:00
Laurent Destailleur
ed25b252b9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 11:30:14 +01:00
Laurent Destailleur
5e92ed0dcd
Fix load lang
2021-01-05 10:44:28 +01:00
Florian HENRY
dfaf77b03f
merge develop
2021-01-03 15:14:34 +01:00
Laurent Destailleur
150b338764
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f
FIX Bad cleaning of VAT rate when numbers are into code
2021-01-02 16:51:34 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe
Debug v13
2021-01-02 16:18:16 +01:00
Laurent Destailleur
37b2046254
Merge pull request #15839 from frederic34/patch-10
...
Update paiement.php
2020-12-30 23:56:21 +01:00
Frédéric FRANCE
123101542b
Update paiement.php
2020-12-30 19:13:20 +01:00
Frédéric FRANCE
39ff3d3190
phpcs
2020-12-30 19:07:46 +01:00
Laurent Destailleur
744bc56953
Merge pull request #15283 from prietojc/12.0.3
...
NEW massaction for Bank Transfer
2020-12-30 13:11:31 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes
...
NEW Can toggle FCKeditor on public/private notes
2020-12-27 15:06:35 +01:00
Laurent Destailleur
b66ec5bc64
Fix css
2020-12-23 23:16:27 +01:00
Laurent Destailleur
d65dc85a10
FIX for php 8
2020-12-23 19:16:25 +01:00
Laurent Destailleur
bac2ae0d5f
Fix warnings
2020-12-22 17:33:17 +01:00
Laurent Destailleur
361f13154b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/fourn/card.php
htdocs/margin/tabs/thirdpartyMargins.php
htdocs/societe/card.php
htdocs/societe/note.php
htdocs/societe/notify/card.php
htdocs/societe/societecontact.php
htdocs/ticket/list.php
2020-12-20 14:31:54 +01:00
Laurent Destailleur
33f8c53cca
Fix var_dump
2020-12-20 14:03:10 +01:00
Laurent Destailleur
8c87050703
FIX Check of customer/vendor code fails in some cases
2020-12-20 13:54:02 +01:00
Laurent Destailleur
a67068ab7b
Fix warnings
2020-12-17 18:08:56 +01:00
Laurent Destailleur
eed14bd9af
Fix warnings
2020-12-17 17:04:42 +01:00
Laurent Destailleur
c092c88dd7
Fix warning
2020-12-17 13:48:28 +01:00
Laurent Destailleur
663d52fef1
Fix warning
2020-12-17 12:31:53 +01:00
Laurent Destailleur
b7876f54cf
Fix warning
2020-12-16 19:10:37 +01:00
Laurent Destailleur
2c7d872320
Fix warning
2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790
Fix warning
2020-12-16 10:55:33 +01:00
Laurent Destailleur
b991badb8c
Fix warning
2020-12-14 13:03:43 +01:00
Laurent Destailleur
cfa194436f
Debug v13
2020-12-11 00:55:21 +01:00
Laurent Destailleur
be249538ee
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2020-12-08 18:17:02 +01:00
Laurent Destailleur
34e7943d09
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/fourn/class/paiementfourn.class.php
2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/fourn/class/paiementfourn.class.php
htdocs/fourn/paiement/card.php
2020-12-08 18:11:39 +01:00
Laurent Destailleur
c6d253ba94
Merge pull request #15660 from Ahuahuachi/develop
...
Translate phpDocs
2020-12-07 22:41:51 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Alfredo Altamirano
6332ce5eea
Translate phpDocs
2020-12-04 17:01:56 -06:00
Laurent Destailleur
4ba31ae52e
Debug missing column packaging
2020-12-04 19:40:56 +01:00
Laurent Destailleur
10bef6eb03
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/opensurvey/class/opensurveysondage.class.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
Laurent Destailleur
9cbdbc460d
Fix multicurrency
2020-12-04 19:10:43 +01:00
Florian HENRY
94d57cd462
fix rounding
2020-12-04 10:03:06 +01:00
Alexandre SPANGARO
0a24298385
FIX: Problem on supplier payment card
2020-12-04 02:57:40 +01:00
Laurent Destailleur
0db72852fb
Fix height of graph
2020-12-03 20:18:37 +01:00
Laurent Destailleur
1ff55100d4
Fix use combobox for warehousr selection
2020-12-03 19:13:40 +01:00
Laurent Destailleur
df48704154
Fix label
2020-12-03 18:45:56 +01:00
Laurent Destailleur
f06d920460
FIX #15583
2020-12-03 16:22:03 +01:00
Laurent Destailleur
e689df8359
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/list.php
htdocs/takepos/invoice.php
htdocs/user/list.php
2020-12-01 10:04:51 +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
Christian Foellmann
f801dd7d66
PR toggle FCKeditor on public/private notes
2020-11-30 16:39:14 +01:00
Laurent Destailleur
958893228a
Fix combo to add contact and status of contact on popup
2020-11-30 15:18:58 +01:00
Laurent Destailleur
4f762cf73d
Fix label
2020-11-30 08:29:19 +01:00
Laurent Destailleur
6c65ebef0d
Look and feel v13
2020-11-29 15:16:53 +01:00
Laurent Destailleur
59b445a103
Clean dead code
2020-11-28 14:47:39 +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
250b42f60a
Fix phpcs
2020-11-27 00:37:36 +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
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
Francis Appels
93ab281d81
Fix tab indent
2020-10-26 18:21:47 +01:00
Francis Appels
91496682fb
Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison
2020-10-26 18:13:36 +01:00
Francis Appels
3ff6f6a04a
Move phpcs enable to correct location @frederic34
2020-10-26 18:13:25 +01:00
stickler-ci
d803c7f429
Fixing style errors.
2020-10-26 16:06:05 +00:00
Francis Appels
7fa7f0a390
Re-add set_date_livraison as a deprecated function.
...
Use correct naming convention for new method naming.
2020-10-26 16:50:52 +01:00
Florian HENRY
967fae594e
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
2020-10-26 16:31:16 +01:00
Florian HENRY
76824c868b
clean get price for fourn and labal for supplier coducment
2020-10-26 16:31:07 +01:00
Frédéric FRANCE
1dab6570ed
Merge branch 'develop' into patch-11
2020-10-26 13:36:33 +01:00
Laurent Destailleur
82db2636f0
Fix phpcs
2020-10-26 13:22:03 +01:00
Frédéric FRANCE
f2c0e3765d
Update card.php
2020-10-25 23:29:51 +01:00
Laurent Destailleur
2638d4596a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2020-10-25 21:33:13 +01:00
Laurent Destailleur
6bc0630c5f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
2020-10-25 21:09:43 +01:00
Laurent Destailleur
baa86d773b
Fix phpcs
2020-10-25 21:07:37 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Maxime Kohlhaas
680ae60b6f
Fix #15064 : error when supplier invoice numbering module is not configured
2020-10-25 08:56:34 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Laurent Destailleur
3bab0a322d
Merge pull request #15110 from frederic34/dol_fiche_head
...
replace deprecated
2020-10-23 04:03:46 +02:00
Laurent Destailleur
254da6923b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/line.php
2020-10-23 04:00:45 +02:00
Laurent Destailleur
0e25843baa
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2020-10-23 03:59:11 +02:00
Laurent Destailleur
62420c5e7b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/fourn/facture/card.php
2020-10-23 03:51:22 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Marc de Lima Lucio
594d9e321e
FIX: invoice payment terms edition: error management
2020-10-22 18:28:27 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Marc de Lima Lucio
1795ec6a9d
FIX: supplier invoice: autoatically calculate payment term when modifying payment condition
2020-10-22 16:11:12 +02:00
Frédéric FRANCE
7d8df07253
Update card.php
2020-10-22 11:46:12 +02:00
Florian HENRY
b0641e6d69
better rix
2020-10-21 13:22:32 +02:00
Florian HENRY
a5e195d1c7
better rix
2020-10-21 13:20:17 +02:00
Florian HENRY
13dfa56c2f
fix recipt when no dispatch
2020-10-21 13:18:11 +02:00
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
Laurent Destailleur
cd9acd02a1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-15 20:51:46 +02:00
Laurent Destailleur
9bbb471b4f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/stats/cabyprodserv.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/loan/card.php
2020-10-15 20:51:30 +02:00
stickler-ci
cd5201e40a
Fixing style errors.
2020-10-15 10:24:00 +00:00
Florian HENRY
0cb04d14d7
NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late
2020-10-15 12:20:37 +02:00
Laurent Destailleur
520645a02c
Renamed all methods valide() into validate()
2020-10-15 10:15:37 +02:00
Laurent Destailleur
9cc8e6ac99
Fix intracommreport
2020-10-14 20:25:02 +02:00
Philippe GRAND
d66a1ac350
fix Call to undefined method Form::formTransportMode()
2020-10-13 10:05:44 +02:00
Laurent Destailleur
57702a1fb1
Retrieve commit a056d37f7255200ef0baf664a6b64516b2392dd9
2020-10-12 20:47:32 +02:00
Laurent Destailleur
e00cf0d37c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-12 19:40:13 +02:00
Laurent Destailleur
042a9f3efe
Fix missing newtoken()
2020-10-12 19:39:54 +02:00
Laurent Destailleur
ff8f4c46d9
Merge pull request #14996 from Givriz/dev
...
Fix : correction de commentaires
2020-10-12 19:37:03 +02:00
Laurent Destailleur
fcd4645509
Standardize code: Property product_libelle renamed into product_label
...
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
Givriz
d158716ccc
Fix : correction de commentaires
...
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais). Il reste beaucoup à faire, mais je fais un premier PR pour vérifier que cela marche.
2020-10-12 17:41:03 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport
...
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
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
Laurent Destailleur
e8b5453976
Merge pull request #14387 from bafbes/abb120133
...
fix: fetch reception on supplier order dispatch fetch
2020-08-07 12:07:24 +02:00
Laurent Destailleur
d3b16374fe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/fourn/class/api_supplier_invoices.class.php
2020-08-07 12:00:52 +02:00
Laurent Destailleur
6fd433167f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-08-07 11:59:55 +02:00
Laurent Destailleur
3a7b53cb22
Merge pull request #14386 from egils-consulting/fix-typos-and-clarify-403-error
...
Update api_supplier_invoices.class.php
2020-08-07 11:47:37 +02:00
Laurent Destailleur
ed6acfa1e7
Better compatibility
2020-08-07 11:45:15 +02:00
Egils Consulting
c52c4229c5
Update api_supplier_invoices.class.php
...
fixes #14831
2020-08-07 11:43:04 +02:00
Laurent Destailleur
669660df4c
Merge pull request #14383 from egils-consulting/patch-1
...
Update api_supplier_invoices.class.php
2020-08-07 11:42:42 +02:00
Egils Consulting
20ea6d86d8
Update api_supplier_orders.class.php
...
Added example of creating a supplier order
2020-08-06 19:57:31 +02:00
Laurent Destailleur
9d79e984dd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
4785e84c43
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
2020-08-06 02:10:17 +02:00
Laurent Destailleur
2fd430bd2c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-06 02:08:44 +02:00
Laurent Destailleur
375fe3f3e8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/fourn/paiement/card.php
2020-08-06 02:08:04 +02:00
Laurent Destailleur
c8bff3a71e
FIX Cannot redeclare class
2020-08-06 02:05:04 +02:00
bahfir abbes
6e16a8a544
fix: fetch reception on supplier order dispatch fetch
2020-08-05 08:36:27 +01:00
Egils Consulting
51ab0a5084
Update api_supplier_invoices.class.php
...
fixes #14831
2020-08-04 22:02:15 +02:00
Egils Consulting
a77b343db2
Update api_supplier_invoices.class.php
...
Unified names.
Renamed variable to an english name $paiementid => $payment_mode_id
Added hints where to look up the IDs needed.
2020-08-04 21:58:01 +02:00
Egils Consulting
3a9021f191
Update api_supplier_invoices.class.php
...
Fix order->invoice and clarify 403 error which is always caused by the invoice already being validated.
2020-08-04 21:47:39 +02:00
Laurent Destailleur
9d4e672475
FIX Debug direct debit module and credit transfer module
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
2020-08-04 21:12:03 +02:00
Laurent Destailleur
5189e8beea
FIX Debug direct debit module and credit transfer module
2020-08-04 20:26:57 +02:00
Laurent Destailleur
4c1aa25b32
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent_emails.php
htdocs/core/tpl/extrafields_list_search_title.tpl.php
htdocs/product/traduction.php
2020-08-04 13:51:11 +02:00
Laurent Destailleur
30560397e4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2020-08-04 13:43:00 +02:00
Laurent Destailleur
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Laurent Destailleur
cc88fe9b68
Merge pull request #14365 from bafbes/abb120131
...
NEW Add link to reset qty on supplier dispatch page
2020-08-04 12:00:47 +02:00
Laurent Destailleur
4bacb7d48e
Update dispatch.php
2020-08-04 12:00:24 +02:00
Laurent Destailleur
fd551261bb
Update dispatch.php
2020-08-04 11:58:29 +02:00
Laurent Destailleur
dbb2e8b1ba
Update dispatch.php
2020-08-04 11:56:01 +02:00
Tim Otte
0e03578e91
Fixed translation of product units in documents
2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
...
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc
Fixed translation of product units in documents
2020-08-04 11:02:16 +02:00
Bahfir Abbes
8dd54e24e7
empty is more useful than 0
2020-08-03 20:42:25 +01:00
bahfir abbes
4900e85fa8
fix: reset link on supplier dispatch
2020-08-03 20:31:55 +01:00
Laurent Destailleur
da76775fbd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/factures.php
htdocs/compta/prelevement/fiche-rejet.php
2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a
FIX Debug module direct debit order. Solve conflict with credit transfer
2020-08-03 20:16:33 +02:00
quentin
bbfca90260
FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order
2020-08-03 11:54:26 +02:00
Laurent Destailleur
ebe2e8ea04
Merge pull request #14319 from aspangaro/13a3
...
NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
2020-08-02 01:33:39 +02:00
bahfir abbes
6d3cebfa3c
fix:erroneous input id name
2020-08-01 12:54:42 +01:00
Alexandre SPANGARO
d1560c3e75
NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
2020-07-30 21:10:06 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2020-07-29 13:53:09 +02:00
Romain DESCHAMPS
eaef99b7af
second approval back in stable feature as is the setting for minimum amount
2020-07-29 13:39:38 +02:00
Laurent Destailleur
9e85abc8c1
Merge pull request #14286 from RomainDeschamps/patch-1
...
second approval back in stable feature as is the setting for minimum …
2020-07-29 13:38:58 +02:00
Laurent Destailleur
d9191c74d8
Update fournisseur.commande.class.php
2020-07-29 12:59:59 +02:00
atm-lena
b480fb2dfc
Delete double line
2020-07-28 15:32:58 +02:00
atm-lena
9f0c3b0db1
fetch() command fourn : Same management as commande.class.php of entity
2020-07-28 15:13:56 +02:00
Laurent Destailleur
364fb05ed3
Fix phpcs
2020-07-28 09:46:31 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
573feed66f
FIX locataxes lost on lines when cloning a vendor invoice
2020-07-25 02:59:49 +02:00
Laurent Destailleur
e3126ec999
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/card_presend.tpl.php
htdocs/multicurrency/class/multicurrency.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Romain DESCHAMPS
09bf8bea85
second approval back in stable feature as is the setting for minimum amount
2020-07-24 14:11:42 +02:00
Laurent Destailleur
a6e728a4d8
Merge pull request #14246 from fappels/11_fix_date_fourn_price_log
...
FIX: date in supplier price log tooltip.
2020-07-24 13:18:36 +02:00
John Botella
fc1de5b4f3
Fix multicurecy option not applied
2020-07-23 11:10:18 +02:00
Francis Appels
c2030a7db5
jdate already in function listProductFournisseurPriceLog
...
So no conversion needed.
2020-07-19 09:43:15 +02:00
stickler-ci
28bc001ba9
Fixing style errors.
2020-07-17 08:52:52 +00:00
Ferran Marcet
125be4271e
New: ##12972 Update supplier price also when product has batch
2020-07-17 10:50:24 +02:00
Francis Appels
1bc1fd4cb4
Fix date in supplier price log tooltip.
2020-07-15 11:24:11 +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
091fbb2824
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 11:55:06 +02:00
Laurent Destailleur
1e9ae1bc02
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Alexandre SPANGARO
82c96a4f83
Fix SticklerCi
2020-07-06 04:47:27 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
960512acd9
Update fournisseur.commande.class.php
...
Action with filter on rowid does not need to have test on entity
2020-06-28 21:21:35 +02:00
Laurent Destailleur
dfb7c3e194
Update fournisseur.commande.class.php
2020-06-28 21:14:49 +02:00
Alexandre SPANGARO
62f55b8549
FIX: SQL Problem in supplier invoice list
2020-06-25 20:43:41 +02:00
florian HENRY
77868ad2a3
fix entity on supplier order
2020-06-24 12:42:41 +02:00
florian HENRY
a7f022dcea
Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0
2020-06-24 12:24:55 +02:00
florian HENRY
8c1af0fdb8
fix enbtoty on supplier order
2020-06-24 12:24:47 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
4d2cbf7006
Fix alert picto of expired services not visible
...
Fix CSS
2020-06-23 11:27:40 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
7d3c176727
Prepare convertion of field "montant" into "amount"
2020-06-17 12:45:56 +02:00
Florian Mortgat
3d69a1dc70
FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn
2020-06-17 11:06:31 +02:00
Laurent Destailleur
4627f06c70
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-16 22:57:50 +02:00
Laurent Destailleur
cbd99ea7a2
FIX #14088
2020-06-16 21:57:49 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/ticket/class/ticket.class.php
2020-06-11 23:39:26 +02:00
Regis Houssin
997cb214f1
FIX avoid error "Call to undefined function measuringUnitString()"
2020-06-11 16:52:24 +02:00
kamel
5bae9db0a8
FIX: Fix detect distached product and set to received completely when the supplier order have services (support STOCK_SUPPORTS_SERVICES)
2020-06-02 17:29:55 +02:00
Laurent Destailleur
ba1e067d32
Merge pull request #13678 from TobiasSekan/cleanupUserRightsForunCommandeCard
...
Cleanup user rights forun commande card
2020-05-28 21:12:23 +02:00
Laurent Destailleur
c7eb71e19e
Merge pull request #13676 from TobiasSekan/CleanupUserRightsForunFactureCard
...
Cleanup user rights on forun facture card
2020-05-28 21:11:58 +02:00
Laurent Destailleur
a92e952960
Merge branch 'NewVendorInvoiceArea' of
...
https://github.com/TobiasSekan/dolibarr into
TobiasSekan-NewVendorInvoiceArea
# Conflicts:
# htdocs/langs/en_US/bills.lang
2020-05-28 18:32:52 +02:00
Laurent Destailleur
714d01bdab
Merge branch 'develop' into CleanupUserRightsForunFactureCard
2020-05-26 00:25:38 +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
fd61214b97
Merge
2020-05-24 01:06:45 +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
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
Laurent Destailleur
45ddde6940
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/holiday/class/holiday.class.php
htdocs/index.php
2020-05-23 20:18:10 +02:00
Laurent Destailleur
40777cbcd9
Fix phpcs
2020-05-23 20:11:10 +02:00
Laurent Destailleur
127534ef55
Fix common var name seems to be $objref for subdir of doc
2020-05-23 20:09:31 +02:00
stickler-ci
66637ba0b6
Fixing style errors.
2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:34:58 +02:00
Laurent Destailleur
7d8323b0a7
Merge pull request #13920 from altatof/dispatch
...
NEW : edit or delete dispatched lines
2020-05-23 14:56:04 +02:00
Tobias Sekan
babcdfc99a
Fix not working default value (re...)
2020-05-23 14:22:40 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice
...
FIX not working default date values for new invoices
2020-05-23 14:21:50 +02:00
Laurent Destailleur
b4fa56d07e
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices
...
FIX not working default values for payment on new invoices
2020-05-23 13:33:01 +02:00
stickler-ci
2873f4dacf
Fixing style errors.
2020-05-22 06:08:12 +00:00
Tobias Sekan
d9a2d2b982
fix not working default values for payment
2020-05-22 08:00:26 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Tobias Sekan
44ffb8dbf7
Fix not working default value (re...)
2020-05-21 09:34:20 +02:00
Frédéric FRANCE
f5688b2eec
add new rule
2020-05-21 01:52:25 +02:00
altairis
55def0248c
fix missing rollbacks
2020-05-20 14:37:35 +02:00
Laurent Destailleur
2f7786f50f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-20 10:37:43 +02:00
Laurent Destailleur
c5e341883d
Fix popup of supplier invoice
2020-05-19 23:22:40 +02:00
altairis
80c56b3017
manage stock on edit and delete dispatched lines
2020-05-19 15:59:03 +02:00
altairis
b79a30c0f9
edit and delete dispatched lines
2020-05-19 14:18:06 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod
...
NEW possibilty to group payments by mode and show their subtotal
2020-05-14 16:55:37 +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
Tobias Sekan
3f5f6b3243
Fix lint errors
2020-05-06 12:09:39 +02:00
Tobias Sekan
468829aa70
Add new vendor invoice area page
2020-05-06 11:48:01 +02:00
Pierre Ardoin
c0b9fef229
Fix issue in status name
...
Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param
Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
2020-05-05 08:40:30 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
DEMAREST Maxime (Indelog)
740b2c9228
NEW possibilty to group payments by mode and show their subtotal
...
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
2020-04-28 09:01:00 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109
Look and feel v12
2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Laurent Destailleur
d416edab1a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
2020-04-24 22:49:59 +02:00
Laurent Destailleur
d11dcc35c3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2020-04-24 19:56:19 +02:00
Laurent Destailleur
6798e9e6f5
Fix remove warning missing the seller in update_price
2020-04-24 19:52:54 +02:00
Laurent Destailleur
e84601f5ed
Merge pull request #13710 from TobiasSekan/FixMissingErrorOnCloneObject
...
FIX not shown error on clone vendor invoice with ExtraFields
2020-04-24 19:01:42 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
Laurent Destailleur
9764af7e9c
Merge pull request #13731 from simicar29/11.0-reception
...
Clean line extrafields when deleting reception
2020-04-24 15:16:51 +02:00
stickler-ci
ababad540a
Fixing style errors.
2020-04-23 17:29:52 +00:00
Marc Guenneugues
b4fbb86548
Clean line extrafields when deleting reception
2020-04-23 19:22:25 +02:00
Laurent Destailleur
7f0e019c78
Merge pull request #13725 from simicar29/11.0-supplierorder
...
Clean line extrafields when deleting supplier order
2020-04-23 18:56:09 +02:00
stickler-ci
4b58213e5b
Fixing style errors.
2020-04-23 16:29:36 +00:00
Marc Guenneugues
64d877bc7b
Clean line extrafields when deleting supplier order
2020-04-23 18:27:06 +02:00
stickler-ci
b5f48fb815
Fixing style errors.
2020-04-23 16:17:37 +00:00
Marc Guenneugues
039fe92209
Clean line extrafields when deleting supplier invoice
2020-04-23 18:14:56 +02:00
Laurent Destailleur
86be024dcc
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Laurent Destailleur
4475df14b4
Finish removal of duplicate hook/trigger
2020-04-23 12:54:28 +02:00
Laurent Destailleur
e1129babbc
Code comment
2020-04-23 12:44:30 +02:00
Laurent Destailleur
93278b2dca
FIX #13713
2020-04-23 12:42:03 +02:00
Sekan, Tobias
f793844862
Fix missing errror on facture clone
2020-04-23 11:04:14 +02:00
Frédéric FRANCE
8ed9c30a89
clean tab/whitespace
2020-04-22 09:02:02 +02:00
Laurent Destailleur
35b5ee28ef
Merge pull request #13680 from adrienjacob/patch-3
...
Add API endpoints for supplier invoice lines
2020-04-22 01:06:57 +02:00
Laurent Destailleur
ae519a1009
Update fournisseur.facture.class.php
2020-04-22 00:59:22 +02:00
stickler-ci
9f4d2ee881
Fixing style errors.
2020-04-21 14:11:33 +00:00
Adrien Jacob
23c2335396
Add API endpoints for supplier invoice lines
2020-04-21 16:07:49 +02:00
Sekan, Tobias
06556fe14c
indent + comments
2020-04-21 12:25:44 +02:00
Sekan, Tobias
7de4f4d0bb
Cleanup user rights on forun commande card
2020-04-21 12:13:15 +02:00
Sekan, Tobias
104e786a79
cleanup user rights on forun facture card
2020-04-21 10:02:18 +02:00
stickler-ci
d4a8718e6c
Fixing style errors.
2020-04-21 08:00:14 +00:00
Adrien Jacob
5353082154
FIX Delete extra fields for supplier invoice line
2020-04-21 09:57:45 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
stickler-ci
27aeaaecb5
Fixing style errors.
2020-04-20 14:42:13 +02:00
Adrien Jacob
91fbccb594
[BUGFIX] Allow update of extra fields
...
This is to make supplier invoices consistent with other similar classes
2020-04-20 14:42:08 +02:00
stickler-ci
36385e3b88
Fixing style errors.
2020-04-20 12:16:34 +00:00
Adrien Jacob
68702f8053
[BUGFIX] Allow update of extra fields
...
This is to make supplier invoices consistent with other similar classes
2020-04-20 14:12:08 +02:00
Laurent Destailleur
13eb1ca28d
Fix link
2020-04-18 04:40:33 +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
atm-quentin
f7c07640dd
viewstatut to search_status
2020-04-15 15:01:00 +02:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02: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
atm-quentin
83f3c9ab6e
use only 1 if
2020-04-10 12:09:18 +02:00
atm-quentin
28fa0e4e5d
FIX missing selectedlines on supplier order but checkbox are displayed
2020-04-10 11:55:00 +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
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Laurent Destailleur
f3d35b5a19
Fix phpcs
2020-04-02 17:06:57 +02:00
Laurent Destailleur
99ddd25ad5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
19084286be
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.product.class.php
2020-04-02 16:49:37 +02:00
Laurent Destailleur
e8fa0ec50c
Merge pull request #13467 from Je2fb/develop
...
Update card.php
2020-04-02 13:30:40 +02:00
Florian Mortgat
f52af23396
NEW: "author" column in the client/supplier invoice lists
2020-04-01 17:09:01 +02:00
Je2fb
fa32618fe9
Update card.php
...
If rate change is modify, the currency price is taken in place of the price from the main currency
2020-03-31 18:58:59 +02:00
atm-quentin
e3dfe60567
uniformize update buyprice + some fixes
2020-03-31 14:53:15 +02:00
Laurent Destailleur
0b7b97ec34
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-03-30 19:42:53 +02:00
Laurent Destailleur
07d64f47e3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-03-30 19:37:29 +02:00
Laurent Destailleur
0ec35793ee
Merge pull request #13433 from ptibogxiv/patch-315
...
NEW filter by product on supplier order API
2020-03-30 19:12:29 +02:00
atm-quentin
64207ef58d
FIX missing array option
2020-03-30 14:18:59 +02:00
Laurent Destailleur
4207d94f53
FIX Bad position of total in column
...
Conflicts:
htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5
FIX Bad position of total in column
2020-03-27 19:08:39 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
ptibogxiv
497b0e4ecc
NEW filter by product on supplier order
...
let's get the next replenishment date and order's informations on front-end for selected products
2020-03-27 15:30:05 +01:00
Laurent Destailleur
20fad86520
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
Laurent Destailleur
51f8c5ca87
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/expensereport/list.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
Alexandre SPANGARO
5528e9ef38
Work on split module fournisseur
2020-03-24 22:02:58 +01:00
Laurent Destailleur
62fefab5ac
Standardize color of status
2020-03-24 19:06:37 +01:00
Laurent Destailleur
01e60562b9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
ca4b641094
FIX #13407
2020-03-23 15:24:29 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38
...
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Laurent Destailleur
7145754376
Can set different warehous, lot during production
2020-03-22 17:06:59 +01:00
Laurent Destailleur
425d2afc4b
Rename js into js.php. Fix some labels
2020-03-22 12:31:27 +01:00
Laurent Destailleur
56d6c4691f
FIX #13382 Note will be concat to private note
2020-03-18 21:06:36 +01:00
Laurent Destailleur
73f2e9e5de
WIP migrate num_paiement into num_payment
...
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
3b72005f93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
4841a5bf4a
Fix look and feel v11
2020-03-13 16:53:37 +01:00
Laurent Destailleur
c605b743e6
Fix look and feel v11
2020-03-13 16:52:00 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
stickler-ci
0babab2824
Fixing style errors.
2020-03-12 11:48:08 +00:00