lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54,042 Commits 43 Branches 150 Tags 886 MiB
9508de85af
Commit Graph

126 Commits

Author SHA1 Message Date
Laurent Destailleur
89d37ccc62 Fix translation 2016-05-17 21:55:39 +02:00
Laurent Destailleur
901c7c9517 Link "Backtolist" was missing on products 2016-05-17 02:16:28 +02:00
Laurent Destailleur
6a0f16e9aa FIX #5189 2016-05-13 20:39:31 +02:00
Sergio Sanchis Climent
cd4e104b76 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/product/card.php
 2016-04-29 12:39:00 +02:00
Juanjo Menent
9909143c42 Merge pull request #5076 from aspangaro/4.0-p21 
FIX: For external api, don't use lengt_accountg without module accountancy activated
 2016-04-29 11:55:55 +02:00
Sergio Sanchis Climent
32d641b66b Bug show product if no accounting enabled 2016-04-28 11:12:04 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture 
change before the freeze)
 2016-04-23 15:37:22 +02:00
aspangaro
a8aeba3ade FIX: For external api, don't use lengt_accountg without module accountancy activated 2016-04-23 07:05:16 +02:00
Laurent Destailleur
d347595d86 Merge pull request #5041 from aspangaro/4.0-p20 
FIX: Accounting library already declared in line 54
 2016-04-21 01:57:44 +02:00
aspangaro
bb554a73bd FIX: Accounting library already declared in line 54 2016-04-19 06:18:34 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2e9832c8d Revert "Corrected non-static usages of Form::multiselectarray function" 
This reverts commit 0a53cdd88f.
 2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
0a53cdd88f Corrected non-static usages of Form::multiselectarray function 2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Laurent Destailleur
2a6009096d Add hidden option PRODUCT_DISABLE_LENGTH and PRODUCT_DISABLE_SURFACE 2016-02-22 13:11:46 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
0b6bd0bc14 More robust error management on barcode module. 2016-02-08 15:49:38 +01:00
Laurent Destailleur
062deae24c Merge 2016-02-05 12:18:50 +01:00
BENKE Charlie
0517435797 add product document generation 2016-02-04 16:21:27 +01:00
Francis Appels
5f7cb75518 Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card 
removed inputs from update form also removed from update action
 2016-02-03 19:52:09 +01:00
Laurent Destailleur
6648ef0064 Fix missing include 2016-01-10 12:37:56 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Laurent Destailleur
99f3870ee6 Fix no picot if no warehouse set 
Fix search on warehouse
 2016-01-08 23:54:40 +01:00
aspangaro
07b42f2bd5 Fix bug with empty code - return -1 2015-12-22 07:31:59 +01:00
aspangaro
61208537d8 Merge remote-tracking branch 'Upstream/develop' into develop-a4 2015-12-22 07:13:56 +01:00
Laurent Destailleur
ad5f65e988 Fix: use the mini image on tooltip of thirdparties 2015-12-21 17:32:57 +01:00
aspangaro
51640c19bb Merge remote-tracking branch 'Upstream/develop' into develop-a4 
Conflicts:
	htdocs/product/card.php
 2015-12-19 05:43:22 +01:00
Laurent Destailleur
dc8e5f45ae Merge pull request #4254 from grandoc/develop 
[Qual] Uniformize code
 2015-12-18 17:13:22 +01:00
philippe grand
c9d6607b04 [Qual] Uniformize code 2015-12-17 14:14:44 +01:00
aspangaro
85f87d45df Add select account in product card 2015-12-17 12:57:08 +01:00
Raphaël Doursenaud
c2642acdba Fix CI build 578 (Syntax error) 
empty() only supports variables in PHP < 5.5
 2015-12-17 10:03:42 +01:00
aspangaro
c34e698d59 Merge remote-tracking branch 'Upstream/develop' into develop-a4 2015-12-17 06:17:32 +01:00
aspangaro
b064d1106b Accountancy Add a list to select accounting account on product card 2015-12-17 06:16:29 +01:00
Laurent Destailleur
6133298e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-16 19:27:23 +01:00
Laurent Destailleur
f87ccc97e2 Miscellaneous fixes 2015-12-16 19:26:50 +01:00
philippe grand
0fe64c6091 [Qual] Uniformize code 2015-12-14 20:54:55 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
 2015-11-26 01:32:21 +01:00
Marcos García de La Fuente
eba5832d3a FIX #4049 PHP warning when trying to access a non-existing product/service 2015-11-21 10:58:58 +01:00
Maxime Kohlhaas
826592c480 Fix info and banner on societe 2015-11-19 14:43:00 +01:00
Marcos García de La Fuente
75b4cb4727 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2 2015-11-07 14:37:47 +01:00
Laurent Destailleur
b2d9f21253 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-06 18:57:46 +01:00
Laurent Destailleur
d0e6db7f89 Use the new banner for first tab of products. 2015-11-06 18:57:35 +01:00
Marcos García de La Fuente
ac8bee28ef NEW #3898 Remove deprecated Product::hidden property 
Close #3898
 2015-11-06 11:40:22 +01:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Raphaël Doursenaud
f0466ba313 FIX #3607 Better categories setting and unsetting 
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
 2015-09-30 18:47:02 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre 
[Qual] Replaced deprecated function calls.
 2015-09-26 08:39:22 +02:00