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

10918 Commits

Author SHA1 Message Date
Laurent Destailleur
3dd53f58f9
Merge pull request #17759 from Hystepik/develop#1 
Fix inventory/inventory.php
 2021-06-04 12:28:55 +02:00
Laurent Destailleur
bd72edc534
Merge pull request #17760 from Hystepik/develop#2 
Fix error name of menu knowledge management system
 2021-06-04 11:50:46 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
0071d63fbb Fix for ro-md language 2021-05-31 13:35:03 +02:00
lmarcouiller
e3a5abe20e Fix error name of menu knowledge management system 2021-05-28 10:02:48 +02:00
lmarcouiller
e87d175041 Fix inventory/inventory.php 2021-05-28 09:57:21 +02:00
Laurent Destailleur
7983ce941e Fix performance page 2021-05-27 01:52:52 +02:00
Laurent Destailleur
f9d6438bae Debug v14 2021-05-25 23:26:03 +02:00
Laurent Destailleur
f252748dbf
Merge pull request #17343 from atm-gauthier/develop_new_collapse_batch_detail 
NEW : collapse batch detail
 2021-05-25 23:04:50 +02:00
lvessiller
38bd595ebd NEW translate supplier order menus and button 2021-05-21 14:18:46 +02:00
Laurent Destailleur
026cc1b35a Debug for smartphone 2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
7569275d28 Fix generation of invoice 2021-05-18 13:36:07 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Laurent Destailleur
0121150e02
Merge pull request #17631 from fappels/14_reception 
Fix: Add test to delete supplier order if reception exist
 2021-05-17 13:22:34 +02:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Laurent Destailleur
082ae2e627 Fix trans 2021-05-17 11:11:17 +02:00
Laurent Destailleur
2f9a504dce Fix label 2021-05-17 09:30:09 +02:00
Laurent Destailleur
9eda9c1e21 Enhance setup 2021-05-12 19:55:16 +02:00
Laurent Destailleur
f504cbcec4 Fix log 2021-05-12 19:18:51 +02:00
Laurent Destailleur
75bd440591 Trans 2021-05-12 18:29:02 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields 
Stock product card traceability fields
 2021-05-11 21:40:50 +02:00
Laurent Destailleur
b090516a73
Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy 
Fix missing FORCEMORPHY in new member form setup
 2021-05-11 19:52:35 +02:00
Laurent Destailleur
c37ccc10b1 Debug v14 2021-05-11 14:50:04 +02:00
Gauthier PC portable 024
f9afe7e81a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-05-10 09:17:15 +02:00
daraelmin
61786d328f
Update members.lang 2021-05-07 14:09:35 +02:00
daraelmin
c61383baf7
Update members.lang 2021-05-07 14:04:55 +02:00
Laurent Destailleur
cc79fc6eee Lang 2021-05-07 11:30:27 +02:00
Laurent Destailleur
e791f9b863 Debug MRP feature 2021-05-06 21:34:59 +02:00
Laurent Destailleur
a7649a5bc2 Trans 2021-05-06 21:15:20 +02:00
Laurent Destailleur
b8b6919cb0 Fix label of dictionaries 2021-05-06 18:41:27 +02:00
Noé Cendrier
b608038370
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 17:41:11 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master 
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 2021-05-06 17:20:46 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 15:21:48 +02:00
altairis-noe
c1b5d26ca0 reconcile before PR - second take 2021-05-06 15:20:49 +02:00
altairis-noe
b979fad859 reconcile before PR 2021-05-06 15:19:29 +02:00
altairis-noe
2bdea3732d days in lifetime trans 2021-05-06 14:52:48 +02:00
altairis-noe
94e485aa06 qc_frequency in days and qcstatus elsewhere 2021-05-05 16:56:25 +02:00
lmarcouiller
020ad5aebe Add endofline in errors.lang 2021-05-05 16:49:51 +02:00
lmarcouiller
6589bab20a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f Fix #17501 : Undownloable attached file 2021-05-05 16:48:04 +02:00
Laurent Destailleur
7860464724 Sync transifex 2021-05-05 01:48:21 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
b14de0bff7 NEW Can clone a cron job. 2021-05-04 10:56:21 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
16f1651d4e Add missing action events in trigger 2021-05-04 00:04:44 +02:00