lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,045 Commits 43 Branches 150 Tags 886 MiB
4958d17d24
Commit Graph

2046 Commits

Author SHA1 Message Date
Raphaël Doursenaud
8d6591ac2f Better comment 2013-07-29 12:31:16 +02:00
Cédric Salvador
5643a714ce changed tab name 2013-07-29 12:31:16 +02:00
Cédric Salvador
d4052f7b9c warning message if you try to create orders without selecting any product 2013-07-29 12:31:16 +02:00
Cédric Salvador
9ff183d432 debug checkbox + use textfields in the to order column 2013-07-29 12:31:16 +02:00
Cédric Salvador
6bf95db95e checkbox + improve order detection 2013-07-29 12:31:16 +02:00
Cédric Salvador
3df097695d removed useless variable 2013-07-29 12:31:16 +02:00
Cédric Salvador
a607cb677d Bug fix: stock to buy now computes correctly when the stock too low picto is present 2013-07-29 12:31:15 +02:00
Cédric Salvador
357dc3e530 datepicker 2013-07-29 12:31:15 +02:00
Cédric Salvador
5062eb8006 check types on getpost + date research 2013-07-29 12:31:15 +02:00
Cédric Salvador
4b90157aa2 switch from print to echo 2013-07-29 12:31:15 +02:00
Raphaël Doursenaud
7abf23c471 PSR coding style 2013-07-29 12:31:15 +02:00
Cédric Salvador
fe8eb1be92 code cleanup 2013-07-29 12:31:14 +02:00
Cédric Salvador
d1550173cd changed valid button label, position and look 2013-07-29 12:31:14 +02:00
Cédric Salvador
1a41511874 redirect user after orders creation 2013-07-29 12:31:14 +02:00
Cédric Salvador
2c3053b9ee selects 2013-07-29 12:31:14 +02:00
Cédric Salvador
72afadb84e fixed success message showing up even when you don't create orders 2013-07-29 12:31:14 +02:00
Cédric Salvador
787125cf12 reformat 2013-07-29 12:31:14 +02:00
Cédric Salvador
3b6fa4a52b message when succeeds/fails to create orders 2013-07-29 12:31:14 +02:00
Cédric Salvador
3c04c6c35b Split the page in two tabs, filters and pagination should work now 2013-07-29 12:31:13 +02:00
Cédric Salvador
407ffb8dd7 typo 2013-07-29 12:31:13 +02:00
Cédric Salvador
47177a2590 typo 2013-07-29 12:31:13 +02:00
Cédric Salvador
c919826104 psr 0 2013-07-29 12:31:13 +02:00
Cédric Salvador
ef8d05676f display the ordered quantity in the ordered column 2013-07-29 12:31:13 +02:00
Cédric Salvador
b261ef2aa2 ordered column 2013-07-29 12:31:13 +02:00
Cédric Salvador
c0c2f9af42 fixed error when trying to create an order when a line has no associated supplier 2013-07-29 12:31:12 +02:00
Cédric Salvador
bcbe940ac0 fixed SQL error when trying to generate an order without selecting any product line 2013-07-29 12:31:12 +02:00
Cédric Salvador
52cfecd0af added an option to use virtual stock instead of physical stock 2013-07-29 12:31:12 +02:00
Cédric Salvador
d4aa2a0f79 show service lines only if the stock services option is enabled 2013-07-29 12:31:12 +02:00
Cédric Salvador
bdb2a00539 products now show up in the list even when they don't have a line in llx_product_stock 2013-07-29 12:31:12 +02:00
Cédric Salvador
d31064a8b1 comments 2013-07-29 12:31:11 +02:00
Cédric Salvador
e5a70ade85 filter out lines where stock > desiredstock 2013-07-29 12:31:11 +02:00
Cédric Salvador
8d00838fa5 moved page + added link in the left menu 2013-07-29 12:31:11 +02:00
Cédric Salvador
194a5f071e trans 2013-07-29 12:31:11 +02:00
Cédric Salvador
6f2bea124f some improvement to the wizard UI 2013-07-29 12:31:11 +02:00
Cédric Salvador
47a1ffd58c order creation wizard 2013-07-29 12:31:11 +02:00
Cédric Salvador
d3975bce7a copyright 2013-07-29 12:31:11 +02:00
Cédric Salvador
e92858be36 wizard UI 2013-07-29 12:31:10 +02:00
Raphaël Doursenaud
2f5f96dc13 PSR coding style 2013-07-29 12:31:10 +02:00
Cédric Salvador
f0243646df code cleanup 2013-07-29 12:31:10 +02:00
Cédric Salvador
dbdaa379c8 reformat 2013-07-29 12:31:10 +02:00
Cédric Salvador
2a4ce81f44 changed valid button label, position and look 2013-07-29 12:31:10 +02:00
Cédric Salvador
2900227236 redirect user after orders creation 2013-07-29 12:31:10 +02:00
Cédric Salvador
9dfa5c4218 selects 2013-07-29 12:31:09 +02:00
Cédric Salvador
89ceafaef5 research by date 2013-07-29 12:31:09 +02:00
Cédric Salvador
6e55d1c471 fixed success message showing up even when you don't create orders 2013-07-29 12:31:09 +02:00
Cédric Salvador
810743cddc fixed research calling replenish.php 2013-07-29 12:31:09 +02:00
Cédric Salvador
2c82484d45 reformat 2013-07-29 12:31:09 +02:00
Cédric Salvador
4c50b23b40 message when succeeds/fails to create orders 2013-07-29 12:31:09 +02:00
Cédric Salvador
a637127599 Split the page in two tabs, filters and pagination should work now 2013-07-29 12:31:09 +02:00
Cédric Salvador
e9ef91cdbc typo 2013-07-29 12:31:08 +02:00
Cédric Salvador
8517706ec2 typo 2013-07-29 12:31:08 +02:00
Cédric Salvador
2f6c979c32 psr 0 2013-07-29 12:31:08 +02:00
Cédric Salvador
e068655e6e display the ordered quantity in the ordered column 2013-07-29 12:31:08 +02:00
Cédric Salvador
dcc6a9aad8 ordered column 2013-07-29 12:31:08 +02:00
Cédric Salvador
47a07c1c29 fixed error when trying to create an order when a line has no associated supplier 2013-07-29 12:31:07 +02:00
Cédric Salvador
d262f044ce fixed SQL error when trying to generate an order without selecting any product line 2013-07-29 12:31:07 +02:00
Cédric Salvador
9b4601bcf2 added an option to use virtual stock instead of physical stock 2013-07-29 12:31:07 +02:00
Cédric Salvador
737aa7819f show service lines only if the stock services option is enabled 2013-07-29 12:31:07 +02:00
Cédric Salvador
80a9dbfb90 products now show up in the list even when they don't have a line in llx_product_stock 2013-07-29 12:31:07 +02:00
Cédric Salvador
9f4e641cd9 comments 2013-07-29 12:31:06 +02:00
Cédric Salvador
66cb265d2b filter out lines where stock > desiredstock 2013-07-29 12:31:06 +02:00
Cédric Salvador
da5bbd0a08 moved page + added link in the left menu 2013-07-29 12:31:06 +02:00
Cédric Salvador
2566f9017d trans 2013-07-29 12:31:06 +02:00
Cédric Salvador
b8f5aef27f some improvement to the wizard UI 2013-07-29 12:31:05 +02:00
Cédric Salvador
3e77575768 order creation wizard 2013-07-29 12:31:05 +02:00
Cédric Salvador
6927274d2a copyright 2013-07-29 12:31:05 +02:00
Cédric Salvador
c1116b672f wizard UI 2013-07-29 12:31:05 +02:00
Cédric Salvador
1c8ac0e9bb display the desiredstock field in product/liste.php 2013-07-29 12:31:05 +02:00
Cédric Salvador
4f39913146 display the desiredstock field in product/reassort.php 2013-07-29 12:31:05 +02:00
Cédric Salvador
ea2d94451a added the desired stock field to the Stock UI 2013-07-29 12:31:04 +02:00
Cédric Salvador
e36613f0f0 added the desired stock field to the create/edit product UI 2013-07-29 12:31:04 +02:00
Laurent Destailleur
1d4ce231db Add manually patch 
9ae9b2b02a
 2013-07-27 12:22:00 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
a240dba290 Fix: Translation of text 2013-07-18 19:01:19 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was 
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
 2013-07-10 17:29:54 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
 2013-06-24 20:02:02 +02:00
Laurent Destailleur
cba1d73dd4 Fix: Can autoselect warehouse if only one warehouse 2013-06-24 19:34:56 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Regis Houssin
cb9dcfa369 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13 New: add product price sharing for multicompany 2013-06-24 17:12:41 +02:00
Laurent Destailleur
0ab500d3a7 Merge pull request #1063 from grandoc/develop 
standardize code
 2013-06-21 08:10:01 -07:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
 2013-06-21 15:37:17 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Florian Henry
035edc12ce Fix [ bug #945 ] error adding a service 2013-06-19 14:41:18 +02:00
Marcos García
4532399026 CR Fix 
I'm getting tired of these commits...
 2013-06-19 09:26:20 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the 
parameter currency of method price.
 2013-06-17 11:58:55 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
706b0d562f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-15 01:09:08 +02:00
Marcos García
829b3bfc1d CR fix 
GIt required mi to commit this changes
 2013-06-14 12:48:27 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Laurent Destailleur
396cbcec62 Fix: Do not update twice level 1 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-06-14 01:23:54 +02:00
Laurent Destailleur
99cbee6486 Fix: Do not update twice level 1 2013-06-14 01:22:38 +02:00
Laurent Destailleur
980901b557 Qual: id of an instance should not be provided into method of instance 2013-06-14 00:23:38 +02:00
Laurent Destailleur
6750987dcb Qual: id of an instance should not be provided into method of instance 2013-06-14 00:21:17 +02:00
Laurent Destailleur
5f60a7c88c Fix: Multiprices were not update by mass vat update tool 2013-06-14 00:11:57 +02:00
Laurent Destailleur
bd8f1f2d2f Fix: Multiprices were not update by mass vat update tool 2013-06-14 00:11:15 +02:00
Laurent Destailleur
d3a500d6c4 Fix: Missing price level for triggers 2013-06-13 23:26:06 +02:00