Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,393 Commits 35 Branches 179 Tags 1.7 GiB
6da82762f2
Commit Graph

1076 Commits

Author SHA1 Message Date
Laurent Destailleur
019125f258 Uniformize code 2016-11-02 10:29:14 +01:00
Laurent Destailleur
a3607fff77 Fix customer ref of shipment 2016-10-30 16:34:46 +01:00
Laurent Destailleur
f95acb24ff Uniformize code 2016-10-30 10:13:55 +01:00
Laurent Destailleur
6a14830049 Merge pull request #5939 from Yacarreon93/develop 
Fix #5931 Shipment closed correctly
 2016-10-29 17:51:08 +02:00
Laurent Destailleur
69fe2bfad6 Fix a case of corrupted data 2016-10-29 17:16:14 +02:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00
Laurent Destailleur
cb3f0dadab NEW Can see/edit the customer ref of a shipment 2016-10-29 14:52:13 +02:00
Laurent Destailleur
b126169723 Fix Missing customer ref of shipment 2016-10-29 14:45:54 +02:00
Yasser Carreón
bf5e2b4159 Fix #5931 Shipment closed correctly 
Refreshes page when shipment is closed or billed to avoid a second
action call.
 2016-10-28 12:33:21 -05:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
384abd8462 Uniformize look and feel 2016-10-25 02:56:46 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
Sergio Sanchis
81a31e8390 Fix: Need declare $user for call trigger 2016-10-18 10:52:07 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Laurent Destailleur
6ac39b97e4 Fix restore list of attached files into action report 2016-10-03 00:38:28 +02:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
fappels
3d58b0aef6 Fix livraison eatby and sellby parameters are dates 2016-09-28 00:22:29 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 01:50:38 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
99a3cc6efc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:47 +02:00
Laurent Destailleur
6d6eceb0ca Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:38 +02:00
fappels
7c772b7608 Fix insert expeditiondet_batch with extrafield 
Line id of extraflied was used iso expeditiondet
 2016-09-07 14:07:29 +02:00
florian HENRY
d6be1cebcb work on going 2016-09-07 12:41:32 +02:00
Laurent Destailleur
f440e78fa6 FIX quick search boxes when nojs or when using smartphone 2016-09-03 12:56:49 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
f0c80bf78b Merge pull request #5388 from atm-florian/dev_new_ship_tag_mail 
NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping
 2016-07-15 14:31:17 +02:00
Laurent Destailleur
1756fdbc9f Popup on links not visible. 2016-07-11 12:59:07 +02:00
florian HENRY
e8f9a558b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_ship_tag_mail 2016-07-07 09:08:47 +02:00
Laurent Destailleur
5713d293e3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-01 03:22:16 +02:00
Alexis Algoud
02169478d0 FIX #4964 buyprice in customer from shipping 
buyprice wasn't load in expedition::fetch_lines
 2016-06-30 15:30:07 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +02:00
Laurent Destailleur
1368e6d462 Fix: error message was not enough to understand 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b Fix: error message was not enough to understand 2016-06-24 17:04:59 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several 
tabs are opened on form to send emails.
 2016-06-24 16:10:52 +02:00
florian HENRY
b43d4bba68 NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping 
mail template
 2016-06-23 11:31:15 +02:00
Laurent Destailleur
7f4e163a52 Fix scrutinizer reports 2016-06-20 02:37:02 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
a29b6440e3 Fix order is closed if all shipments are closed. 2016-06-09 22:40:21 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Maxime Kohlhaas
cc2b2a0baa Don't delete link between order and shipment 2016-06-04 11:52:36 +02:00
Laurent Destailleur
5106f40a56 Merge branch 'develop_NEW_decrease_stock_expedition_classify' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify

Conflicts:
	htdocs/expedition/class/expedition.class.php
 2016-06-02 11:23:49 +02:00
Laurent Destailleur
4c93340de1 Merge pull request #5232 from atm-florian/develop 
Add trigger into expedition class
 2016-05-29 13:15:35 +02:00
Laurent Destailleur
ef1e4d05ec Doc comment 2016-05-27 17:01:23 +02:00
Laurent Destailleur
9511187f6e FIX Change to status "Shipment in progress" for orders is done whane 
validating and not creating a shipment.
 2016-05-27 16:49:55 +02:00