Commit Graph

5199 Commits

Author SHA1 Message Date
Laurent Destailleur
82757f0989
Merge pull request #17775 from dolibit-ut/patch-337
Update list.php
2021-06-04 10:35:51 +02:00
Laurent Destailleur
3a201fa017
Merge pull request #17776 from dolibit-ut/patch-338
Update card.php
2021-06-04 10:35:28 +02:00
Laurent Destailleur
36eaad89aa
Merge pull request #17777 from dolibit-ut/patch-339
Update card.php
2021-06-04 10:35:11 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note
ADD note to supplier order refusal
2021-06-04 10:10:17 +02:00
Laurent Destailleur
c7e21daee7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 09:36:20 +02:00
Laurent Destailleur
621aa9e6f3 Fix typo 2021-06-04 09:27:33 +02:00
Laurent Destailleur
3ae3137eaf Missing picto 2021-06-04 08:57:48 +02:00
Laurent Destailleur
350a421544
Update card.php 2021-06-04 08:41:26 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
Christian Foellmann
55d48077a3 ADD note to supplier order refusal 2021-05-31 10:45:34 +02:00
UT from dolibit
7aae5be54a
Update card.php 2021-05-31 10:36:43 +02:00
UT from dolibit
fed7878d18
Update card.php
$lineid  was duplicate
2021-05-31 10:33:36 +02:00
UT from dolibit
a97efdbdfa
Update list.php
$title = $langs->trans('Supplier')." - ".$langs->trans('ProductsAndServices');
2021-05-31 10:31:25 +02:00
Frédéric FRANCE
1662d4a829
fix warnings 2021-05-25 23:14:36 +02:00
Laurent Destailleur
8f9de222c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-25 21:53:56 +02:00
Laurent Destailleur
4b47611e23 Debug v14 2021-05-25 21:21:09 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier
NEW translate supplier order menus and button
2021-05-25 20:34:17 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
fb6aea72b8 Fix syntax error 2021-05-25 12:06:29 +02:00
lvessiller
38bd595ebd NEW translate supplier order menus and button 2021-05-21 14:18:46 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/translation.php
2021-05-20 15:00:39 +02:00
Laurent Destailleur
e6e6574cb8
Merge pull request #17667 from aspangaro/11p1
FIX wrong variable fk_code_ventilation register for addline
2021-05-20 14:31:52 +02:00
Laurent Destailleur
217ee260c2 css 2021-05-19 15:11:47 +02:00
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +02:00
Alexandre SPANGARO
f86e10b453 FIX wrong variable fk_code_ventilation register for addline 2021-05-19 06:37:02 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
2021-05-17 19:50:10 +02:00
Laurent Destailleur
4e5a3a22c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 13:36:48 +02:00
Laurent Destailleur
7d82a20995 Add missing property 2021-05-17 13:36:27 +02:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
2021-05-17 10:47:00 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode
uniformize supplier cards
2021-05-11 19:25:26 +02:00
Laurent Destailleur
6bec5d7e3c
Update document.php 2021-05-11 19:23:46 +02:00
Laurent Destailleur
70451050ae
Update contact.php 2021-05-11 19:22:46 +02:00
Laurent Destailleur
1c477d2131
Update card.php 2021-05-11 19:21:38 +02:00
Laurent Destailleur
e3cb04e235
Merge pull request #17540 from ibuiv/ibuiv-supplierorder-hooks
New Hooks for Supplier Order Card tabs
2021-05-11 19:12:24 +02:00
Laurent Destailleur
a4f9025843
Merge pull request #17541 from fappels/14_debug_dispatch
Fix edit-delete from dispatch card when reception activated.
2021-05-11 19:03:18 +02:00
Frédéric FRANCE
dc90103526
Update document.php 2021-05-11 18:36:27 +02:00
Laurent Destailleur
88ca25903d
Merge pull request #17559 from aspangaro/14b7
Fix Title supplier order
2021-05-11 18:15:02 +02:00
Laurent Destailleur
8a2a996595
Merge pull request #17562 from oscim/patch-42
Update card.php
2021-05-11 18:10:07 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode 2021-05-11 18:09:05 +02:00
Alexandre SPANGARO
a830e498de Merge remote-tracking branch 'upstream/develop' into 14b7 2021-05-11 07:01:39 +02:00
Laurent Destailleur
d7a5e342ab Optimize some widgets 2021-05-10 20:16:51 +02:00
stickler-ci
b9bdd9ed8a Fixing style errors. 2021-05-10 12:13:50 +00:00
oscim
dfe0ccee45
Update card.php
Add hook for block boxstats in fourn card
2021-05-10 14:10:54 +02:00
Laurent Destailleur
ed18045807 FIX The comment of a reception was not correctly managed 2021-05-10 11:30:37 +02:00
Francis Appels
cd8c71497d replace deprecated warehouse 'libelle' 2021-05-10 10:10:30 +02:00
Alexandre SPANGARO
7993e4634a Fix Title supplier order info card 2021-05-10 07:01:24 +02:00
Alexandre SPANGARO
eccd883156 Fix Title supplier order document card 2021-05-10 06:54:17 +02:00
Alexandre SPANGARO
db50f8c27b Fix Title supplier order note card 2021-05-10 06:49:49 +02:00