lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,448 Commits 43 Branches 150 Tags 886 MiB
4a23a8a789
Commit Graph

2208 Commits

Author SHA1 Message Date
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Alexis Algoud
34948ef2d6 Add somes dol_escape_htmltag on product cards inputs 2014-04-23 14:53:23 +02:00
Juanjo Menent
d527c4cf73 Fix: Price min of composition is not supplier price min by quantity 2014-04-22 09:57:43 +02:00
Laurent Destailleur
bb2c829997 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
 2014-04-18 12:34:32 +02:00
Laurent Destailleur
ce34c01b9e New: On page to enter supplier prices, if there is no supplier, add 
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
 2014-04-16 00:06:16 +02:00
Laurent Destailleur
9fb029890c Doxygen 2014-04-13 02:08:57 +02:00
BENKE Charles
32090eeeb5 Update product.class.php 
init the stock_warehouse Array during fetch instead we omit to load the stock (wrong value stay inside)
 2014-04-12 11:41:32 +02:00
Laurent Destailleur
81ff0a8643 Fix: Missing initialized value 2014-04-12 01:45:18 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
417a1232ef Uniformize usage of function price 2014-04-11 18:00:58 +02:00
Grand Philippe
9a056ab497 anglicizing 2014-04-08 14:05:10 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
Laurent Destailleur
1affc38d58 Merge pull request #1509 from defrance69/patch-1 
Update mouvement.php
 2014-03-27 15:59:39 +01:00
Laurent Destailleur
68b54f5cac New: Add hidden option PRODUCT_DISABLE_CUSTOM_INFO to disable custom 
info management (used for export activity only)
 2014-03-25 19:52:04 +01:00
BENKE Charles
680ce297c5 Update mouvement.php 
sometime $year not filled then made "bug" the search
propose to fill with current year in this case
 2014-03-25 15:41:20 +01:00
Laurent Destailleur
ada22837a5 Fix: form to add images should not show link form 2014-03-18 22:26:09 +01:00
Laurent Destailleur
3030c2f431 Fix: form to add images should not show link form 2014-03-18 22:24:57 +01:00
Laurent Destailleur
2d3c700a7d Fix: When cloning product, autogenerating barcode must not use same 
number.
Qual: Moved dedicated permission of module to "advance" permissions.
 2014-03-16 17:37:54 +01:00
Maxime Kohlhaas
233a8fa917 Add new PHPUnit test on Entrepot 2014-03-16 11:38:39 +01:00
Maxime Kohlhaas
67342486a6 Task 1074 : add link to source document on stock movement 2014-03-15 02:18:39 +01:00
jean
9ccf99ab4a correction erreur sql update url = null 2014-03-14 23:04:27 +01:00
Laurent Destailleur
4154f07dfd New: Add a public url as a property for products/services. 2014-03-14 13:51:46 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Laurent Destailleur
4acf721c8c Merge pull request #1451 from KreizIT/dluo_step3 
Batch number management Step 3
 2014-03-11 15:54:23 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
2a853329e5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php
 2014-03-08 14:25:59 +01:00
Laurent Destailleur
06b2c646c3 Fix: Add a space after (int) for travis succes ;) 2014-03-06 18:31:02 +01:00
Alexis Algoud
d139009ef5 bug on update service with service created in 3.4 2014-03-05 15:29:28 +01:00
Laurent Destailleur
6c536d43e5 Can also sort on username. Uniformize code of index page. 2014-03-05 11:37:32 +01:00
KreizIT
d9ea0e0e8c Travis again (It's susceptible) 2014-03-05 11:30:43 +01:00
KreizIT
feae560aa3 Travis correction. 2014-03-05 11:28:40 +01:00
Laurent Destailleur
e9adec49eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-05 11:22:12 +01:00
Laurent Destailleur
60327e92d1 New: Add filter on text and status into survey list. Can also sorter on 
id, text and date end.
 2014-03-05 11:22:01 +01:00
KreizIT
58f2bf078b -Add batch record management 
-Implements stock increase or decrease with batch number record on product's warehouse tab
 2014-03-05 10:54:07 +01:00
Laurent Destailleur
cdd2815d45 Merge pull request #1449 from KreizIT/dluo_step2 
Dluo step2
 2014-03-05 00:08:58 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
0b83f1a670 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-01 15:06:25 +01:00
Laurent Destailleur
6f4de6e6d0 Fix: [ bug #520 ] Product statistics and detailed lists are wrong 2014-03-01 15:05:00 +01:00
Laurent Destailleur
dfb4117bb5 Fix: Invalid image link 2014-03-01 14:58:06 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-28 21:43:29 +01:00
Laurent Destailleur
de159d569a Fix: Missing transactions 2014-02-27 16:40:25 +01:00
Florian Henry
ec8ad9f8bb codesniffer 2014-02-23 20:10:05 +01:00
Florian Henry
4cbdf32ae6 codesniffer 2014-02-23 17:21:26 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature. 
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
 2014-02-19 01:51:19 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
7e3c2d40ba New: Make difference between virtual and physical stock easier to 
understand.
 2014-02-15 14:14:49 +01:00
Laurent Destailleur
ccab2b7af4 Fix: Must use "null" for value when finished is not defined but not when 
finished is "0".
 2014-02-12 19:00:06 +01:00