Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

4371 Commits

Author SHA1 Message Date
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
a80621471c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
 2018-04-27 12:42:18 +02:00
Laurent Destailleur
e5df7e206b Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal 
Fix wrong price on supplier order line
 2018-04-27 12:20:49 +02:00
Laurent Destailleur
d179cafa9c Update fournisseur.commande.class.php 2018-04-27 12:19:32 +02:00
Laurent Destailleur
ecd84f6c45 Update fournisseur.commande.class.php 2018-04-27 12:18:45 +02:00
Laurent Destailleur
4c87cbf644 Update card.php 2018-04-27 12:14:51 +02:00
Laurent Destailleur
1cbf5f1c5e Merge pull request #8687 from dolibarr95/patch-43 
NEW : Allow negative quantity for dispatch (supplier order)
 2018-04-27 11:41:05 +02:00
Laurent Destailleur
0a4bd14bc3 Merge pull request #8678 from defrance/patch-111 
add $user on delete line
 2018-04-27 10:31:19 +02:00
Laurent Destailleur
2ecbd132aa Merge pull request #8668 from tuxgasy/Add_Hook_ordersupplierdispatch 
New ordersupplierdispatch hook
 2018-04-27 09:47:22 +02:00
Laurent Destailleur
59e5545aa7 Fix phpunit 2018-04-27 09:18:25 +02:00
dolibarr95
1fb6f79727 Update dispatch.php 
Only without batch module enabled
 2018-04-27 09:14:52 +02:00
dolibarr95
14e68ea8f9 Allow qty to be negative 2018-04-26 16:42:08 +02:00
BENKE Charlene
c879232fd7 add $user on delete line 
possible to hamonize the call function for all line->delete ?
 2018-04-24 23:41:12 +02:00
Laurent Destailleur
5eb7c7ffff FIX Edit of ref_supplier in supplier invoice 2018-04-24 13:22:34 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price 
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
 2018-04-24 12:57:31 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00
TuxGasy
6d552a2ae6 Add ordersupplierdispatch hook 2018-04-23 15:05:37 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
06e51703b1 Clean constructors 2018-04-21 16:01:05 +02:00
Laurent Destailleur
912d5c53f2 Standardize code 2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb Optimize constructors 2018-04-21 15:08:46 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang
 2018-04-16 18:19:21 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290 Fix translation of button action must be a verb 2018-04-16 11:12:56 +02:00
Laurent Destailleur
2959dc4a3a Fix regression 2018-04-15 18:20:04 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
florian HENRY
ad403c7045 fix syntax and uniformize code 2018-04-14 17:04:38 +02:00
Laurent Destailleur
b4ef3945d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-04-13 23:52:08 +02:00
Laurent Destailleur
6a3c2f9808 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-04-13 23:27:14 +02:00
Laurent Destailleur
50a3b73a6f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:29 +02:00
Laurent Destailleur
3ec295935c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:18 +02:00
Laurent Destailleur
c25e21de4b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 23:19:22 +02:00
Laurent Destailleur
8cfcdabcac Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-04-13 23:03:46 +02:00
atm-greg
4fae1e3236 rank of invoice_supplier lines was always -1 2018-04-13 17:01:10 +02:00
atm-greg
8d4126274a rang was missing on order_supplier lines 2018-04-13 15:53:49 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
atm-greg
ef2c6a0ed4 fix sql error 2018-04-13 10:31:36 +02:00
atm-greg
58535993c1 use special_code on order_supplier lines 2018-04-13 10:31:27 +02:00
Laurent Destailleur
6e288fca75 Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
Laurent Destailleur
3078b890d4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/admin/stripe.php
 2018-04-13 00:45:39 +02:00
Laurent Destailleur
f7bb781b42 FIX #8571 2018-04-13 00:43:15 +02:00
Laurent Destailleur
1c9661d9d6 FIX Update incoterm on supplier invoice 2018-04-12 21:39:12 +02:00