Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 01:23:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,065 Commits 37 Branches 191 Tags
bb492d6d1f09d3ddd3b002aea696d06d03f032df
Commit Graph

33617 Commits

Author SHA1 Message Date
Laurent Destailleur
bb492d6d1f Fix: filter on warehouse 2013-10-10 15:45:03 +02:00
Laurent Destailleur
3e91a4d982 Fix translation for paraguay 2013-10-09 21:43:31 +02:00
Laurent Destailleur
8aff0e2e1e Trans: Add language file for paraguay. 2013-10-09 21:31:17 +02:00
Laurent Destailleur
0f343d3f8a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/langs/fr_FR/stocks.lang
 2013-10-09 21:10:31 +02:00
Laurent Destailleur
a11a0d6491 Fix: debug replanishment feature 2013-10-09 21:09:15 +02:00
Laurent Destailleur
864315d018 Fix: debug replanishment feature 2013-10-09 21:07:00 +02:00
Laurent Destailleur
661faa63dd Fix: filter on warehouse 2013-10-09 20:42:46 +02:00
Laurent Destailleur
f4a83f0851 Qual: Debug of replenishment feature 2013-10-09 20:30:49 +02:00
Laurent Destailleur
d2c4de9232 Fix: translation 2013-10-09 15:00:42 +02:00
Laurent Destailleur
603c2aa938 Qual: Removed not used file 2013-10-08 21:35:44 +02:00
Laurent Destailleur
894f46cd10 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-08 21:15:20 +02:00
Laurent Destailleur
eb10b2c5e9 Fix: missing property 2013-10-08 21:14:54 +02:00
Laurent Destailleur
87ca1d2e2e Fix: translation 2013-10-08 15:18:00 +02:00
Laurent Destailleur
3f8738ad2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-08 15:16:36 +02:00
Laurent Destailleur
ef86f150be Fix: duplicate field 2013-10-08 12:25:41 +02:00
Maxime Kohlhaas
845deb9a63 Add multilang management in ODT models 2013-10-08 09:17:04 +02:00
Laurent Destailleur
a690ae05f6 Fix: ref_ext was not loaded 2013-10-08 00:42:40 +02:00
Laurent Destailleur
4958d17d24 Doxygen 2013-10-08 00:42:28 +02:00
Laurent Destailleur
51a82a2418 Fix: Clean param 2013-10-08 00:04:09 +02:00
Laurent Destailleur
b778700c95 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/contact/fiche.php
 2013-10-07 22:52:14 +02:00
Laurent Destailleur
c235c4e4ba Fix: security sql injection 2013-10-07 22:50:27 +02:00
Laurent Destailleur
ebb1dbcec3 Fix: security sql injection 2013-10-07 22:50:12 +02:00
Laurent Destailleur
3f94af792b Fix: security sql injection 2013-10-07 22:49:33 +02:00
Laurent Destailleur
47a9837046 Uniformize ref_customer into list 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
 2013-10-07 21:58:12 +02:00
Laurent Destailleur
c35135b62b Fix: use css3 2013-10-07 16:59:38 +02:00
Laurent Destailleur
123beb1e34 Fix: Bad property 2013-10-07 16:58:07 +02:00
Laurent Destailleur
141258f514 Merge remote-tracking branch 'origin/3.4' into develop 
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-10-07 16:17:51 +02:00
Christophe Battarel
02278a399c better margin calculation (especially for credit notes) 2013-10-05 10:29:22 +02:00
Christophe Battarel
37e47272c7 fix bugs on margin reports 2013-10-05 10:21:38 +02:00
Laurent Destailleur
2e3aad282c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-04 15:10:06 +02:00
Laurent Destailleur
2ffb16b99d Fix: permissions on files. 2013-10-02 23:48:13 +02:00
Laurent Destailleur
61f583e035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-02 16:19:54 +02:00
Laurent Destailleur
4a59a99190 Fix: No filter when already on filtered warehouse. 2013-10-02 16:19:35 +02:00
Laurent Destailleur
3fb890e9b7 New: Add total of unique different product into warehouse 2013-10-02 12:49:28 +02:00
Florian Henry
d41ceae64a - New: Can choose contact on event (action com) creation, and filtred by 
thirdparty
 2013-10-01 18:11:53 +02:00
Laurent Destailleur
2061739371 Fix: Update must be done with id 2013-10-01 17:49:56 +02:00
Laurent Destailleur
957ff08458 New: Add update method for web service product. 2013-10-01 11:59:35 +02:00
Laurent Destailleur
cf89a8e96a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-29 19:22:16 +02:00
Laurent Destailleur
fc77bd26ee Sync from transifex 2013-09-29 19:21:59 +02:00
Laurent Destailleur
9244d4e58e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-29 14:01:29 +02:00
Laurent Destailleur
601de7a308 Fix: Test not working 2013-09-29 14:00:56 +02:00
Laurent Destailleur
abe7946883 Synchro with transifex 2013-09-28 19:54:28 +02:00
Laurent Destailleur
7544c7e5a4 Synchro with transifex 2013-09-28 18:10:42 +02:00
Laurent Destailleur
9891e32962 Fix: Removed duplicate entry 2013-09-28 16:50:55 +02:00
Laurent Destailleur
b695204259 Fix: invert parameters 2013-09-28 13:27:53 +02:00
Laurent Destailleur
019c86dff0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8 New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS 2013-09-28 13:24:58 +02:00
Laurent Destailleur
9b36df85dd Fix: invert parameters 2013-09-28 13:22:28 +02:00
Laurent Destailleur
7ac7034494 Merge pull request #1247 from altairis-fr/3.4 
fix bug on filter and sort
 2013-09-27 09:01:17 -07:00
Laurent Destailleur
4eb4c5f922 Some users report they need more time 2013-09-27 11:04:21 +02:00