Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 09:01:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,390 Commits 39 Branches 191 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0b09493ecb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-19 23:42:30 +02:00
Laurent Destailleur
9ee9079d78 update doc 2013-09-19 23:05:48 +02:00
Laurent Destailleur
2a1dae78ca Fix: We must not remove sources from packages 2013-09-19 19:49:41 +02:00
Laurent Destailleur
42f5ca15df Fix: Add missing field info_bits into predefined invoices. 2013-09-19 14:58:35 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
a86e8f8fac Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-19 01:00:05 +02:00
Laurent Destailleur
848c693822 Fix: Error in url 2013-09-19 00:59:02 +02:00
Laurent Destailleur
8de0de08ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	build/debian/get-orig-source.sh
 2013-09-19 00:53:09 +02:00
Laurent Destailleur
847b0234c7 Change for debian 2013-09-19 00:49:51 +02:00
Laurent Destailleur
30c4d5dedb Fix for debian package 2013-09-19 00:39:13 +02:00
Laurent Destailleur
f5717c7384 Change for debian 2013-09-19 00:37:57 +02:00
Laurent Destailleur
986794ad7f Fix doxygen 2013-09-18 23:39:53 +02:00
Laurent Destailleur
d03714d6d6 Fix: select 2013-09-18 23:29:21 +02:00
Laurent Destailleur
369eabc69e Fix: bad condition 
Conflicts:
	htdocs/societe/societe.php
 2013-09-18 23:26:35 +02:00
Laurent Destailleur
1810433a93 Fix: bad condition 2013-09-18 23:24:09 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
04752dbfbe Doxygen: More comments 2013-09-18 17:59:57 +02:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier 
invoices.
 2013-09-18 16:46:54 +02:00
Laurent Destailleur
711146f5ea Merge pull request #1241 from atm-maxime/develop 
Fix : wrong contact list was used for cc and ccc in formmail
 2013-09-18 05:53:19 -07:00
Maxime Kohlhaas
e3d4a7bc35 Fix : wrong contact list was used for cc and ccc in formmail 2013-09-18 13:36:22 +02:00
Laurent Destailleur
d478d8c1fe Fix: Permission to read an event should depend on agenda module 
permissions.
We add a check for thirdparty for external users
 2013-09-18 11:56:42 +02:00
Laurent Destailleur
d3efd86e3d Fix: Syntax error 2013-09-18 00:33:49 +02:00
Laurent Destailleur
1e29a97a89 Fix: checkstyle 2013-09-17 21:12:34 +02:00
Laurent Destailleur
23c151ee14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-17 20:22:36 +02:00
Laurent Destailleur
c241fa1bfc Track error 2013-09-17 20:22:02 +02:00
simnandez
f7299f1a28 [ task #1063 ] Allow edit localtaxes rate for thirds 2013-09-17 18:06:06 +02:00
simnandez
c0b57fccaf [ task #1063 ] Allow edit localtaxes rate for thirds 2013-09-17 17:43:14 +02:00
simnandez
7f21e596dd [ task #1063 ] Allow edit localtaxes rate for thirds. Init Works 2013-09-17 17:17:59 +02:00
BENKE Charles
14e96f5c1b Update 3.4.0-3.5.0.sql 2013-09-17 10:39:30 +02:00
BENKE Charles
a6335c44fe Update companies.lang 2013-09-17 10:36:21 +02:00
BENKE Charles
1e34bc26bc Update companies.lang 2013-09-17 10:35:41 +02:00
BENKE Charles
4a2ef0810d Update societe.class.php 2013-09-17 10:33:47 +02:00
BENKE Charles
7e9fb00f11 Update fiche.php 2013-09-17 10:27:02 +02:00
BENKE Charles
1f503948a8 Update llx_societe.sql 
add outstanding value
 2013-09-17 10:15:24 +02:00
Laurent Destailleur
e47165fa38 Merge pull request #1239 from csalvador/replenishment-fix 
Replenishment fix
 2013-09-16 10:39:35 -07:00
Laurent Destailleur
09de33ad97 Merge pull request #1232 from GPCsolutions/pgsql-installer 
Fixed SQL install script for PostgreSQL
 2013-09-16 10:39:11 -07:00
Laurent Destailleur
7e87c7f1cb Merge pull request #1227 from csalvador/natural_search 
natural search in list pages
 2013-09-16 10:38:16 -07:00
Laurent Destailleur
921777449f New: [ task #90 ] Barcode search 2013-09-16 17:10:49 +02:00
Cédric Salvador
967c20e3e9 Improved error message 2013-09-16 14:51:22 +02:00
Cédric Salvador
c62c7c0b1f Stock calculation was wrong in certain cases, should be ok now 2013-09-16 14:37:53 +02:00
Laurent Destailleur
01fb596555 New: [ task #90 ] Barcode search 2013-09-16 14:29:17 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
b0e03462d3 fixed empty being used on a function 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
5cbccd5fc0 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-16 13:44:37 +02:00
Laurent Destailleur
a1e7333613 Fix: bug preventing creation of predefined invoice. 
Also added phpunit test to detect it if it occurs again.
 2013-09-16 13:42:42 +02:00
Laurent Destailleur
9826b202e9 New: Provide both tags for string formated amount and numeric amount 
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
 2013-09-16 12:42:01 +02:00
Laurent Destailleur
949b8c6274 Mark method classer_facturee deprecated. 
Make better translation of some workflow options.
 2013-09-16 11:50:53 +02:00
Laurent Destailleur
c98c8d5007 Fix: url 2013-09-15 22:48:42 +02:00
Laurent Destailleur
93ea2714a9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-15 22:40:08 +02:00