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

40771 Commits

Author SHA1 Message Date
aspangaro
315e9239ac Merge remote-tracking branch 'Upstream/develop' into develop-accountancy2 2015-05-02 06:45:53 +02:00
aspangaro
1174c67b07 Accountancy - Add key language & prepare journal for expense report 2015-05-02 06:42:06 +02:00
Frédéric FRANCE
d8af7a45f8 Typo 2015-05-01 19:10:47 +02:00
Frédéric FRANCE
e3f980e32c Typo 2015-05-01 18:44:27 +02:00
Juanjo Menent
6f6ff6697a Merge pull request #2742 from aspangaro/develop-ER_badge 
New: ER add badge on tab document
 2015-05-01 16:24:47 +02:00
Juanjo Menent
300d6532a1 Merge pull request #2740 from aspangaro/develop-devcamp 
Fix: ER Typo on variable $_SERVER, correct Link & traduce button
 2015-05-01 16:24:32 +02:00
Raphaël Doursenaud
31a8e38d37 Allow exporting projects without a third party 
FIX #2729

Conflicts:
	htdocs/core/modules/modProjet.class.php
 2015-05-01 16:01:57 +02:00
Raphaël Doursenaud
93937fe7f3 Allow exporting projects without a third party 
FIX #2729
 2015-05-01 15:58:36 +02:00
aspangaro
b0eee2976c New: ER add badge on tab document 2015-05-01 08:46:37 +02:00
aspangaro
b03a9dffeb Fix : ER Correct Link 2015-05-01 07:18:19 +02:00
aspangaro
95058607a4 Fix : ER Typo on all variable $_SERVER & traduce of button "Edit" not works 2015-05-01 07:13:04 +02:00
Juanjo Menent
29c9686b8e Merge pull request #2730 from GPCsolutions/dolibarr-2718 
Export task labels
 2015-04-30 21:02:17 +02:00
Juanjo Menent
40be94452d Merge pull request #2734 from GPCsolutions/unitfix 
Fix missing unit parameter
 2015-04-30 20:54:00 +02:00
Juanjo Menent
4a4630a4a3 Merge pull request #2735 from GPCsolutions/dolibarr-2632 
Add sensible default mode to directory creation
 2015-04-30 20:51:37 +02:00
Juanjo Menent
91767edd05 Fixed SQL table reference for members types in export 2015-04-30 20:50:05 +02:00
Raphaël Doursenaud
afc582a369 Fixed SQL table reference for members types in export 
FIX #2712
 2015-04-30 17:20:53 +02:00
Francis Appels
f762d6d7cb Add tcpdfbarcode 
Add modTcpdfbarcode class
Add pdf_label class
pdf_standardlabel extends pdf_label
 2015-04-30 16:41:52 +02:00
Raphaël Doursenaud
2c44aa6742 Add sensible default mode to directory creation 
Fix #2632
 2015-04-30 16:22:01 +02:00
Raphaël Doursenaud
7b538d8842 Fix missing unit parameter 
Prevented the input of supplier invoices lines from working
 2015-04-30 15:59:20 +02:00
Raphaël Doursenaud
2058d21da9 Export task labels 
FIX #2718
 2015-04-30 11:43:42 +02:00
Laurent Destailleur
6b3c060d9c Fix doxygen 2015-04-30 00:07:30 +02:00
Laurent Destailleur
060d8a1a38 FIX Ref/label of product on contract line was not visible, nor into 
page, nor into PDF.
 2015-04-29 19:57:01 +02:00
Laurent Destailleur
83daa67cc6 FIX Description of contract line was not visible. 2015-04-29 19:15:14 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Laurent Destailleur
b0071a7c6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/main.inc.php
 2015-04-28 21:14:17 +02:00
Laurent Destailleur
1a70e9c5f9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-28 21:12:38 +02:00
Laurent Destailleur
b30ee6b3fa Better fix for #2725 2015-04-28 21:12:04 +02:00
Drosis Nikos
524a535f6d hide password 2015-04-28 16:34:03 +03:00
Juanjo Menent
6cfd8d64f5 Change bugtracker to github in all maintened versions 2015-04-27 20:34:52 +02:00
Juanjo Menent
cfaaf56428 Change bugtracker to github in all maintened versions 2015-04-27 20:34:26 +02:00
Juanjo Menent
ebe1f4a74d -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-04-27 20:31:12 +02:00
Laurent Destailleur
416e34d50d Fix error management 2015-04-27 20:26:56 +02:00
Laurent Destailleur
f9a428d550 Fixed #2714 2015-04-27 20:25:02 +02:00
Laurent Destailleur
b619c64770 Fix #2713 2015-04-27 20:24:02 +02:00
Juanjo Menent
93024830f5 -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1
 2015-04-27 20:22:03 +02:00
fmarcet
1c01e187c1 Fix: Bug in the new photo system 2015-04-27 17:20:10 +02:00
fmarcet
99c4508029 Fix: Bug in the new photo system 2015-04-27 16:44:12 +02:00
Laurent Destailleur
50a6c133c9 Fix error management 2015-04-27 11:46:30 +02:00
Laurent Destailleur
92f2c48475 Fixed #2714 2015-04-27 11:46:08 +02:00
Laurent Destailleur
ce05837237 Translation 2015-04-27 09:55:59 +02:00
Laurent Destailleur
2e05a4f1be Fix #2713 2015-04-27 03:21:55 +02:00
Laurent Destailleur
aa9bffe5c9 Fix translation 2015-04-27 02:34:15 +02:00
Laurent Destailleur
4e04f75c66 Fix css 2015-04-27 02:33:44 +02:00
Laurent Destailleur
5b3b180c10 NEW Web service to create or update product can correct stock during 
creation/update.
 2015-04-27 01:36:13 +02:00
Laurent Destailleur
1e237defb0 Fix phpcs 2015-04-26 17:59:02 +02:00
Laurent Destailleur
4235d74aac Fix tests for ES 2015-04-26 16:45:24 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Laurent Destailleur
7b9d9c4d0a Fix lang 2015-04-26 16:25:02 +02:00
Laurent Destailleur
025d8c2a71 Clean script migration 2015-04-25 23:22:44 +02:00
Laurent Destailleur
7c706ebaf6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-25 23:15:55 +02:00
Laurent Destailleur
60a56da370 Some change into css. Tabs background are now white so main content is 
black on white (better contrast).
Fix editfieldval for date.
 2015-04-25 22:20:10 +02:00
Laurent Destailleur
13b4d86064 Better fix for #2709 2015-04-24 21:29:02 +02:00
Laurent Destailleur
d925e552ca Merge pull request #2709 from atm-alexis/3.7 
FIX event not linked to contact on creation
 2015-04-24 21:23:50 +02:00
Laurent Destailleur
5a509940f3 Merge pull request #2706 from GPCsolutions/mobiledetect 
Mobiledetect
 2015-04-24 21:22:56 +02:00
Laurent Destailleur
a091158cce Merge pull request #2690 from open-minds/develop 
Add sorting for extra fields values
 2015-04-24 21:10:27 +02:00
Laurent Destailleur
de74bbed3a Merge pull request #2702 from atm-gauthier/3.7 
FIX : display linked object in edit mode when we create an event from an...
 2015-04-24 21:10:02 +02:00
Laurent Destailleur
788ec8cd88 Merge pull request #2698 from fappels/3.7 
FIX: can show print page after product save
 2015-04-24 21:08:20 +02:00
Laurent Destailleur
125c821bc4 add comment 2015-04-24 20:47:45 +02:00
Alexis Algoud
7d3482036d FIX event not linked to contact on creation 2015-04-24 17:40:53 +02:00
Laurent Destailleur
6dab9f0283 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-24 10:59:41 +02:00
Laurent Destailleur
576cd57a94 NEW Can edit internal label of invoice even when closed (this is a 
private information)
 2015-04-24 10:59:18 +02:00
Laurent Destailleur
e0d2c43086 fix phpcs 2015-04-24 01:15:29 +02:00
Laurent Destailleur
d47b9a759a FIX migration error 2015-04-24 00:33:02 +02:00
Raphaël Doursenaud
7281ea21e6 Qual: moved mobiledetect external library 
External libraries resides in the include directory
 2015-04-23 20:30:33 +02:00
Raphaël Doursenaud
f07c174c9c FIX: moved built-in bug report system to GitHub Issues 
Improved environment informations and presentation
 2015-04-23 18:43:32 +02:00
Gauthier
58008cef94 NEW : display linked object in edit mode when we create an event from an order, propal... 2015-04-23 16:28:29 +02:00
Laurent Destailleur
94ff635cc2 NEW Add filter on user contact or user task into task list 2015-04-23 16:20:25 +02:00
Laurent Destailleur
0e141f2c1b Fix css 2015-04-23 15:35:32 +02:00
Laurent Destailleur
4f3fe82e93 NEW Add filter on task ref and task label into list of tasks 2015-04-23 15:22:50 +02:00
Laurent Destailleur
1fcf10fd8a Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-23 13:55:08 +02:00
Laurent Destailleur
c97c5e0cfd Fix selection of user was lost 2015-04-23 13:54:49 +02:00
Laurent Destailleur
7fd2247297 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-23 13:45:02 +02:00
Laurent Destailleur
f9285d6d23 NEW Can add all user of a project as user of a task, in one step. 2015-04-23 13:44:45 +02:00
aspangaro
f4e346c75b Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp 2015-04-23 07:30:20 +02:00
aspangaro
3ae8428a12 New: Add search field for value date in vat payment list 2015-04-23 07:26:09 +02:00
Juanjo Menent
f7ab53be8e Fix test for es. Dumps 3.5 et 3.6 2015-04-22 23:40:43 +02:00
Juanjo Menent
1ed573f98b Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in 
commande.class.php on line 852
 2015-04-22 23:31:24 +02:00
Francis Appels
93d9321088 FIX: can show print page after product save 
Add product id to form action to be able show print page from product
card after save.
 2015-04-22 23:27:09 +02:00
Laurent Destailleur
305030ae6c Fix test to match new field names of note 2015-04-22 21:58:12 +02:00
Laurent Destailleur
807824aaad Fix warnings 2015-04-22 21:48:59 +02:00
Laurent Destailleur
47ecb91a3e Avoid DOS attack when high number of tasks 2015-04-22 21:17:49 +02:00
Laurent Destailleur
be4ad5460e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-22 20:28:43 +02:00
Laurent Destailleur
9ef809e91b Fix migration tools 2015-04-22 20:28:21 +02:00
Laurent Destailleur
7f5377d219 Fix #2695 2015-04-22 19:25:20 +02:00
Laurent Destailleur
b57d3ddf03 Merge pull request #2695 from Ankapi/develop 
Fixed hook "pdfgeneration" in the pdf blochet of cheque deposit
 2015-04-22 19:24:40 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
9279a3a349 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-22 17:39:33 +02:00
Laurent Destailleur
208ac31bf8 Fix test for es 2015-04-22 17:39:09 +02:00
David Avigni (Ankapi)
e298bd0a68 Fixed hook "pdf generation", executeHooks misnamed: replacement 
"adterPDFCreation" with "afterPDFCreation"
 2015-04-22 15:23:52 +02:00
Laurent Destailleur
12d841f27d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-22 14:58:39 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Frédéric FRANCE
768fdde2d1 Update product.class.php 2015-04-22 10:39:32 +02:00
aspangaro
b35c929cad Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp 2015-04-22 07:18:52 +02:00
aspangaro
560150fd1c Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default) 2015-04-22 07:15:17 +02:00
Laurent Destailleur
f3ea694b97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-22 00:17:24 +02:00
Laurent Destailleur
5b758e0e16 Fix migration process 2015-04-22 00:17:03 +02:00
Laurent Léonard
e0cc007487 Add sorting for extra fields values 2015-04-21 20:21:24 +02:00
Juanjo Menent
b9b21bce8a Merge pull request #2679 from marcosgdf/bug-1786-2 
FIX [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
 2015-04-21 18:52:56 +02:00
Laurent Destailleur
bce952fa9b Fix bad link 2015-04-21 17:06:13 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00