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

43078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
0d121de1a6 Fix: [ bug #1388 ] Wrong date when invoicing several orders 2014-05-23 02:48:24 +02:00
Marcos García de La Fuente
9cc74c36d2 Missing copyright info 2014-05-23 02:45:15 +02:00
Marcos García de La Fuente
77c09d887a Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes 2014-05-23 02:44:02 +02:00
aspangaro
22bd18486b Merge branch 'upstream/develop' 2014-05-23 02:25:41 +02:00
aspangaro
0a670092d5 Fix :: Account_parent must be an int - Step 1 2014-05-23 02:23:32 +02:00
Marcos García de La Fuente
b2f299f5e4 Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled 2014-05-23 02:22:38 +02:00
Marcos García de La Fuente
603c28dcdd [ bug #1397 ] Filter by supplier orders with status Draft does not filter 2014-05-23 02:04:02 +02:00
Laurent Destailleur
349d6177d1 Clean more secondary languages 
Add information of file and line number when a duplicate translation key
is found.
 2014-05-22 14:35:53 +02:00
Laurent Destailleur
e9ab84074e Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 14:33:42 +02:00
Laurent Destailleur
3481884731 Fix: A project is linked to a thirdparty (may be a customer, a supplier 
or a prospect).
 2014-05-22 13:20:03 +02:00
Laurent Destailleur
13da9c368e Merge pull request #1615 from FHenry/3.5 
3.5
 2014-05-22 13:16:04 +02:00
Florian HENRY
2a16a562d9 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-05-22 12:51:55 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +02:00
Laurent Destailleur
4e00d4467c Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 12:41:43 +02:00
guerinaxel
1e3b8e56f2 Add extrafields to productorservice webservice 2014-05-22 12:10:40 +02:00
guerinaxel
0d71350c76 Rename mode_reglement_id into payment_mode_id 2014-05-22 08:54:14 +02:00
Laurent Destailleur
3f96632e02 Fix: CRLF 2014-05-21 20:34:52 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
c82ff0a146 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-05-21 19:51:05 +02:00
Laurent Destailleur
4a89446162 Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:47:41 +02:00
Laurent Destailleur
b146dcad31 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-21 19:45:28 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Regis Houssin
b39627288e Fix: missing hookmanager global 2014-05-21 11:48:45 +02:00
Laurent Destailleur
753ef28168 Fix: Data are clean once registered into dictionnaries. 2014-05-20 16:08:05 +02:00
guerinaxel
30a25251d9 Adding var mode_reglement_id to facture 
Adding var mode_reglement_id to facture in order to change the payment method.
 2014-05-20 09:59:42 +02:00
Laurent Destailleur
28de634a95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 20:42:38 +02:00
Laurent Destailleur
08c4a5dac7 Fix: Typo 2014-05-19 20:42:14 +02:00
Florian HENRY
ff1eb983c8 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-19 16:22:19 +02:00
Florian HENRY
5a5c858578 [ bug #1399 ] [pgsql] Silent warning when setting a propal as 
"facturée" in propal.php
 2014-05-19 16:21:59 +02:00
Laurent Destailleur
544bd27700 Merge pull request #1611 from guerinaxel/patch-3 
Correcting log use for commonobject.class.php
 2014-05-19 16:12:20 +02:00
Laurent Destailleur
ff46adf284 Merge pull request #1607 from GPCsolutions/3.6b-review 
3.6b review
 2014-05-19 16:07:49 +02:00
Laurent Destailleur
56415400eb Merge pull request #1606 from FHenry/3.5 
escape for insert SQL expedition module
 2014-05-19 16:03:36 +02:00
guerinaxel
1dbcd215b8 Correcting log use for commonobject.class.php 
Correcting dol_syslog use which had 3 parameters instead of 2.
 2014-05-19 15:54:43 +02:00
Laurent Destailleur
e09cc127fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 15:10:46 +02:00
Raphaël Doursenaud
00162cc93d Members: fixed typo 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
c83a0309b1 Barcode: fixed wrong menu 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
c3f05d1c1c Withdrawals: fixed bad translation key 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
3209483f1b Bank search: Better wording 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
400de35248 Products: missing translations 2014-05-19 14:38:18 +02:00
Raphaël Doursenaud
55e7862027 Added missing local communities links 2014-05-19 14:37:37 +02:00
Raphaël Doursenaud
13cb2e478f Contracts module configuration: missing translation string 2014-05-19 14:37:30 +02:00
Raphaël Doursenaud
fa1af990d2 Third party module configuration: cosmetic change 
Align the button on the right
 2014-05-19 14:33:39 +02:00
Raphaël Doursenaud
0fd994a687 Install: english comments 2014-05-19 14:33:39 +02:00
Raphaël Doursenaud
ba8676dc61 Install: unlimitted memory is ok 2014-05-19 14:33:39 +02:00
BENKE Charles
86e0d377f8 Update objectline_view.tpl.php 2014-05-19 09:40:06 +02:00
BENKE Charles
c8067931e3 Update commonobject.class.php 2014-05-19 09:32:42 +02:00
Laurent Destailleur
5709179cf0 Fix: Box was not added on correct side 2014-05-19 00:05:49 +02:00
BENKE Charles
b210d7a00f Update commonobject.class.php 
Hide the margintable if click at the top of it (usefull when customer are just in front of you), reappear when you click again
 2014-05-18 14:59:20 +02:00
Laurent Destailleur
39ce76ba1b Sync from transifex 2014-05-18 12:25:20 +02:00