Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 01:23:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
79,163 Commits 37 Branches 191 Tags
0e23fbc6dfd8be42a2cd417a40320b2d6ba42da3
Commit Graph

4242 Commits

Author SHA1 Message Date
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
ce090d43a0 Close #8907 2019-10-01 15:01:29 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
b28cd1bb57 Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Laurent Destailleur
c0e7c558a1 Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception 
NEW widget box for supplier orders awaiting reception
 2019-09-27 15:32:43 +02:00
Laurent Destailleur
f5c839217a Merge pull request #11914 from fmarcet/develop 
Fix: Load invoices only if showed
 2019-09-27 14:34:16 +02:00
Laurent Destailleur
72ea1a2867 Merge pull request #11927 from OPEN-DSI/fix-fournisseur-product-display-histo-tooltip 
FIX dol_print_date format in buying price tooltip
 2019-09-27 12:25:26 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
VESSILLER
cf7193691f FIX dol_print_date format in buying price tooltip 2019-09-18 11:22:32 +02:00
Ferran Marcet
81d8055a9c New: Load invoices only if showed 2019-09-17 09:43:15 +02:00
Laurent Destailleur
80f498f206 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-14 19:25:52 +02:00
Laurent Destailleur
bbb62f27c7 Update doc 2019-09-14 19:25:09 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Laurent Destailleur
3caa1bd43c FIX Debug feature orderstoinvoice for suppliers 2019-09-14 18:21:37 +02:00
Laurent Destailleur
844f0903da Fix missing fields 2019-09-14 17:34:57 +02:00
ATM john
337194023a Add purchase orders awaiting reception to workboard 2019-09-10 22:10:20 +02:00
Laurent Destailleur
1d74387125 Removed deprecated property ->numero (We must use ->num_payment) 2019-09-09 08:47:23 +02:00
Laurent Destailleur
30d2f84eb7 Remove a label that is no more used 2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289 Merge pull request #11793 from altatof/supplierorderstatus 
Differentiate supplier orders status
 2019-09-07 10:54:03 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
 2019-09-06 14:27:01 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
16484e1fa3 Fix balance of td 2019-09-06 02:22:44 +02:00
Laurent Destailleur
80daf29d79 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation

Conflicts:
	htdocs/fourn/commande/card.php
 2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation
 2019-09-06 01:52:51 +02:00
Laurent Destailleur
92e7d7bb26 Fix duplicate translation 2019-09-05 16:18:20 +02:00
Laurent Destailleur
f7ce723686 Merge pull request #11800 from jtraulle/fix-11427-10.0 
FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
 2019-09-03 12:56:00 +02:00
Laurent Destailleur
98459363df Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Jean Traullé
237c29d428 FIX #11427 require product class 
Fixes POST /supplierinvoices REST API endpoint
 2019-08-31 00:07:14 +02:00
Jean Traullé
c32c7d48ba Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Christophe Battarel
8c8844d7ae Differentiate supplier orders status 2019-08-30 09:33:01 +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
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
b7e7ca46b5 Fix responsive 2019-08-23 14:01:13 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96 Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
b8406f842d Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list 
Fix total on list and amount opened on thirdparty card (for supplier)
 2019-08-15 21:14:03 +02:00
Laurent Destailleur
7035bf88ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 19:52:01 +02:00
Laurent Destailleur
f1a63fd51b Merge pull request #11684 from jtraulle/fix-rest-api-supplierinvoices-post-with-lines-fk_product 
FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
 2019-08-15 19:51:12 +02:00
Laurent Destailleur
f26a13ff13 NEW Removed deprecated code that create linked object from ->origin 2019-08-15 19:50:18 +02:00
Jean Traullé
c739b95666 Fix codestyle 
lessc.class.php should be excluded from ruleset as it is an external lib
 2019-08-14 23:33:06 +02:00
Jean Traullé
003642fe10 Preserve spaces instead of tabs for indentation. 2019-08-14 23:07:18 +02:00
Jean Traullé
1d2c2f8551 NEW Add payments GET and POST REST API endpoints for supplierinvoices. 2019-08-14 23:00:40 +02:00